opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

pkg/apparmor: fix when AA is disabled

Browse Source 
Do not try to load the default profile when AppArmor is disabled on the
host.

Fixes: #3331
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2019-06-14 17:33:47 +02:00
parent 1322b41aa0
commit e611176760
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/apparmor/apparmor_linux.go
View File

@ -225,8 +225,13 @@ func CheckProfileAndLoadDefault(name string) (string, error) {
} }
} }
if name != "" && !runcaa.IsEnabled() { // Check if AppArmor is disabled and error out if a profile is to be set.
return "", fmt.Errorf("profile %q specified but AppArmor is disabled on the host", name) if !runcaa.IsEnabled() {
if name == "" {
return "", nil
} else {
return "", fmt.Errorf("profile %q specified but AppArmor is disabled on the host", name)
}
} }
// If the specified name is not empty or is not a default libpod one, // If the specified name is not empty or is not a default libpod one,