diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-07 19:33:13 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 06:13:21 -0400 |
commit | 2db81452931eb51cc739d6e495cf1bd4860c3c99 (patch) | |
tree | 959805577a8e8c449fc4b3c576d2f0c840090fa4 /security/apparmor/domain.c | |
parent | e4849737f76c8767e70dc1575f6e59fc3682b3fe (diff) |
userns: Convert apparmor to use kuid and kgid where appropriate
Cc: John Johansen <john.johansen@canonical.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'security/apparmor/domain.c')
-rw-r--r-- | security/apparmor/domain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index b81ea10a17a3..60f0c76a27d3 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c | |||
@@ -721,7 +721,7 @@ audit: | |||
721 | if (!permtest) | 721 | if (!permtest) |
722 | error = aa_audit_file(profile, &perms, GFP_KERNEL, | 722 | error = aa_audit_file(profile, &perms, GFP_KERNEL, |
723 | OP_CHANGE_HAT, AA_MAY_CHANGEHAT, NULL, | 723 | OP_CHANGE_HAT, AA_MAY_CHANGEHAT, NULL, |
724 | target, 0, info, error); | 724 | target, GLOBAL_ROOT_UID, info, error); |
725 | 725 | ||
726 | out: | 726 | out: |
727 | aa_put_profile(hat); | 727 | aa_put_profile(hat); |
@@ -848,7 +848,7 @@ int aa_change_profile(const char *ns_name, const char *hname, bool onexec, | |||
848 | audit: | 848 | audit: |
849 | if (!permtest) | 849 | if (!permtest) |
850 | error = aa_audit_file(profile, &perms, GFP_KERNEL, op, request, | 850 | error = aa_audit_file(profile, &perms, GFP_KERNEL, op, request, |
851 | name, hname, 0, info, error); | 851 | name, hname, GLOBAL_ROOT_UID, info, error); |
852 | 852 | ||
853 | aa_put_namespace(ns); | 853 | aa_put_namespace(ns); |
854 | aa_put_profile(target); | 854 | aa_put_profile(target); |