GitList

Browse code

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>

Christopher Jones authored on 2016/09/30 06:05:31
Showing 2 changed files

pkg/aaparser/aaparser.go

History View file @ 1a70211

@@ -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
+                     	}

profiles/apparmor/apparmor.go

History View file @ 1a70211

@@ -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,