From be7d576f5db1b96b92d801a811cf161ebca945a7 Mon Sep 17 00:00:00 2001 From: Xianglin Gao Date: Tue, 29 Nov 2016 15:48:38 +0800 Subject: [PATCH] fix apparmor load profile Signed-off-by: Xianglin Gao (cherry picked from commit 2ab8f2e389b4ae90d0cec6555ea5708ceca1cc3c) Signed-off-by: Victor Vieux --- pkg/aaparser/aaparser.go | 3 +-- profiles/apparmor/template.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/aaparser/aaparser.go b/pkg/aaparser/aaparser.go index 4eee2a1679..ffcc5647a9 100644 --- a/pkg/aaparser/aaparser.go +++ b/pkg/aaparser/aaparser.go @@ -4,7 +4,6 @@ package aaparser import ( "fmt" "os/exec" - "path/filepath" "strconv" "strings" ) @@ -26,7 +25,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", profilePath) if err != nil { return err } diff --git a/profiles/apparmor/template.go b/profiles/apparmor/template.go index dd9da97216..c5ea4584de 100644 --- a/profiles/apparmor/template.go +++ b/profiles/apparmor/template.go @@ -40,7 +40,7 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) { {{if ge .Version 208095}} # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container - ptrace (trace,read) peer=docker-default, + ptrace (trace,read) peer={{.Name}}, {{end}} } `