summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-07-19 17:40:49 +1000
committerJames Morris <james.l.morris@oracle.com>2014-07-19 17:40:49 +1000
commitfd33c43677a7965624b46352a686a7c1e72ae4aa (patch)
tree10c2b8bfa4635b50d4cccd9c9453a9020a01e1a9 /security
parent2ccf4661f315615d018686d91d030a94001d0cc6 (diff)
parentc2e1f2e30daa551db3c670c0ccfeab20a540b9e1 (diff)
downloadop-kernel-dev-fd33c43677a7965624b46352a686a7c1e72ae4aa.zip
op-kernel-dev-fd33c43677a7965624b46352a686a7c1e72ae4aa.tar.gz
Merge tag 'seccomp-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next
Diffstat (limited to 'security')
-rw-r--r--security/apparmor/domain.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index 452567d..d97cba3 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -621,7 +621,7 @@ int aa_change_hat(const char *hats[], int count, u64 token, bool permtest)
* There is no exception for unconfined as change_hat is not
* available.
*/
- if (current->no_new_privs)
+ if (task_no_new_privs(current))
return -EPERM;
/* released below */
@@ -776,7 +776,7 @@ int aa_change_profile(const char *ns_name, const char *hname, bool onexec,
* no_new_privs is set because this aways results in a reduction
* of permissions.
*/
- if (current->no_new_privs && !unconfined(profile)) {
+ if (task_no_new_privs(current) && !unconfined(profile)) {
put_cred(cred);
return -EPERM;
}
OpenPOWER on IntegriCloud