beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "apparmor: Check if apparmor_parser is available"

Browse source 
This reverts commit ab3fa46502.

This fix was partial, and is not needed with the proper fix in
containerd.

Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
This commit is contained in:
Bjorn Neergaard 2023-02-11 15:48:04 -07:00
parent 174802e15f
commit c4c54683a9
No known key found for this signature in database
1 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
daemon/apparmor_default.go
View file

@ -5,12 +5,9 @@ package daemon // import "github.com/docker/docker/daemon"
import ( import (
"fmt" "fmt"
"os"
"sync"
"github.com/containerd/containerd/pkg/apparmor" "github.com/containerd/containerd/pkg/apparmor"
aaprofile "github.com/docker/docker/profiles/apparmor" aaprofile "github.com/docker/docker/profiles/apparmor"
"github.com/sirupsen/logrus"
) )
// Define constants for native driver // Define constants for native driver
@ -19,11 +16,6 @@ const (
defaultAppArmorProfile = "docker-default" defaultAppArmorProfile = "docker-default"
) )
var (
checkAppArmorOnce sync.Once
isAppArmorAvailable bool
)
// DefaultApparmorProfile returns the name of the default apparmor profile // DefaultApparmorProfile returns the name of the default apparmor profile
func DefaultApparmorProfile() string { func DefaultApparmorProfile() string {
if apparmor.HostSupports() { if apparmor.HostSupports() {
@ -33,20 +25,7 @@ func DefaultApparmorProfile() string {
} }
func ensureDefaultAppArmorProfile() error { func ensureDefaultAppArmorProfile() error {
checkAppArmorOnce.Do(func() { if apparmor.HostSupports() {
if apparmor.HostSupports() {
// Restore the apparmor_parser check removed in containerd:
// https://github.com/containerd/containerd/commit/1acca8bba36e99684ee3489ea4a42609194ca6b9
// Fixes: https://github.com/moby/moby/issues/44900
if _, err := os.Stat("/sbin/apparmor_parser"); err == nil {
isAppArmorAvailable = true
} else {
logrus.Warn("AppArmor enabled on system but \"apparmor_parser\" binary is missing, so profile can't be loaded")
}
}
})
if isAppArmorAvailable {
loaded, err := aaprofile.IsLoaded(defaultAppArmorProfile) loaded, err := aaprofile.IsLoaded(defaultAppArmorProfile)
if err != nil { if err != nil {
return fmt.Errorf("Could not check if %s AppArmor profile was loaded: %s", defaultAppArmorProfile, err) return fmt.Errorf("Could not check if %s AppArmor profile was loaded: %s", defaultAppArmorProfile, err)