apparmor: Fix change_onexec when called from a confined task

Fix failure in aa_change_onexec api when the request is made from a confined
task.  This failure was caused by two problems

 The AA_MAY_ONEXEC perm was not being mapped correctly for this case.

 The executable name was being checked as second time instead of using the
 requested onexec profile name, which may not be the same as the exec
 profile name. This mistake can not be exploited to grant extra permission
 because of the above flaw where the ONEXEC permission was not being mapped
 so it will not be granted.

BugLink: http://bugs.launchpad.net/bugs/963756

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index 7c69599a69e1..6327685c101e 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -410,7 +410,8 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
                  * exec\0change_profile
                  */
                 state = aa_dfa_null_transition(profile->file.dfa, state);
-                cp = change_profile_perms(profile, cxt->onexec->ns, name,
+                cp = change_profile_perms(profile, cxt->onexec->ns,
+                                          cxt->onexec->base.name,
                                           AA_MAY_ONEXEC, state);
 
                 if (!(cp.allow & AA_MAY_ONEXEC))