Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[23.0 backport] apparmor: Check if apparmor_parser is available #44942

Merged
merged 1 commit into from Feb 7, 2023
Merged

[23.0 backport] apparmor: Check if apparmor_parser is available #44942

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 22 additions & 1 deletion daemon/apparmor_default.go
View file
Open in desktop
Expand Up @@ -5,9 +5,12 @@ package daemon // import "github.com/docker/docker/daemon"

import (
"fmt"
"os"
"sync"

"github.com/containerd/containerd/pkg/apparmor"
aaprofile "github.com/docker/docker/profiles/apparmor"
"github.com/sirupsen/logrus"
)

// Define constants for native driver
Expand All @@ -16,6 +19,11 @@ const (
defaultAppArmorProfile = "docker-default"
)

var (
checkAppArmorOnce sync.Once
isAppArmorAvailable bool
)

// DefaultApparmorProfile returns the name of the default apparmor profile
func DefaultApparmorProfile() string {
if apparmor.HostSupports() {
Expand All @@ -25,7 +33,20 @@ func DefaultApparmorProfile() string {
}

func ensureDefaultAppArmorProfile() error {
if apparmor.HostSupports() {
checkAppArmorOnce.Do(func() {
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)
if err != nil {
return fmt.Errorf("Could not check if %s AppArmor profile was loaded: %s", defaultAppArmorProfile, err)
Expand Down