From: John Johansen <john.johansen@canonical.com>
Date: Sat, 16 Apr 2016 21:19:38 +0000 (-0700)
Subject: apparmor: fix audit full profile hname on successful load
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7ee6da25dcce27b6023a8673fdf8be98dcf7cacf;p=linux.git

apparmor: fix audit full profile hname on successful load

Currently logging of a successful profile load only logs the basename
of the profile. This can result in confusion when a child profile has
the same name as the another profile in the set. Logging the hname
will ensure there is no confusion.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Seth Arnold <seth.arnold@canonical.com>
---

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index db31bc5e459f3..ca402d028db8b 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -1159,7 +1159,7 @@ ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace)
 		list_del_init(&ent->list);
 		op = (!ent->old && !ent->rename) ? OP_PROF_LOAD : OP_PROF_REPL;
 
-		audit_policy(op, GFP_ATOMIC, ent->new->base.name, NULL, error);
+		audit_policy(op, GFP_ATOMIC, ent->new->base.hname, NULL, error);
 
 		if (ent->old) {
 			__replace_profile(ent->old, ent->new, 1);