summaryrefslogtreecommitdiffstats
path: root/security/apparmor/domain.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2013-02-18 16:05:34 -0800
committerJohn Johansen <john.johansen@canonical.com>2013-04-28 00:36:20 -0700
commit7a2871b566f34d980556072943295efd107eb53c (patch)
tree7f991bd472872e62780ba9119d8e3a3784008dfc /security/apparmor/domain.c
parent0ca554b9fca425eb58325a36290deef698cef34b (diff)
downloadop-kernel-dev-7a2871b566f34d980556072943295efd107eb53c.zip
op-kernel-dev-7a2871b566f34d980556072943295efd107eb53c.tar.gz
apparmor: use common fn to clear task_context for domain transitions
Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Steve Beattie <sbeattie@ubuntu.com>
Diffstat (limited to 'security/apparmor/domain.c')
-rw-r--r--security/apparmor/domain.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index fb47d5b..07fcb09 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -512,11 +512,7 @@ x_clear:
cxt->profile = new_profile;
/* clear out all temporary/transitional state from the context */
- aa_put_profile(cxt->previous);
- aa_put_profile(cxt->onexec);
- cxt->previous = NULL;
- cxt->onexec = NULL;
- cxt->token = 0;
+ aa_clear_task_cxt_trans(cxt);
audit:
error = aa_audit_file(profile, &perms, GFP_KERNEL, OP_EXEC, MAY_EXEC,
OpenPOWER on IntegriCloud