mirror of
https://github.com/moby/moby.git
synced 2026-06-30 19:58:03 +00:00
Fix apparmor profile installation
Fixes #26823 Fixes an issue where apparmor was not loaded into the kernel, because apparmor_parser was being called incorrectly. Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
This commit is contained in:
@@ -26,7 +26,7 @@ func GetVersion() (int, error) {
|
||||
// LoadProfile runs `apparmor_parser -r` on a specified apparmor profile to
|
||||
// replace the profile.
|
||||
func LoadProfile(profilePath string) error {
|
||||
_, err := cmd("-r", filepath.Dir(profilePath))
|
||||
_, err := cmd("", "-r", filepath.Dir(profilePath))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -66,8 +66,8 @@ func macroExists(m string) bool {
|
||||
return err == nil
|
||||
}
|
||||
|
||||
// InstallDefault generates a default profile and installs it in the
|
||||
// ProfileDirectory with `apparmor_parser`.
|
||||
// InstallDefault generates a default profile in a temp directory determined by
|
||||
// os.TempDir(), then loads the profile into the kernel using 'apparmor_parser'.
|
||||
func InstallDefault(name string) error {
|
||||
p := profileData{
|
||||
Name: name,
|
||||
|
||||
Reference in New Issue
Block a user