diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-07-19 09:40:49 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-19 09:40:49 +0200 |
| commit | fd33c43677a7965624b46352a686a7c1e72ae4aa (patch) | |
| tree | 10c2b8bfa4635b50d4cccd9c9453a9020a01e1a9 /kernel/sys.c | |
| parent | Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next (diff) | |
| parent | seccomp: implement SECCOMP_FILTER_FLAG_TSYNC (diff) | |
| download | linux-fd33c43677a7965624b46352a686a7c1e72ae4aa.tar.xz linux-fd33c43677a7965624b46352a686a7c1e72ae4aa.zip | |
Merge tag 'seccomp-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 66a751ebf9d9..ce8129192a26 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1990,12 +1990,12 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, if (arg2 != 1 || arg3 || arg4 || arg5) return -EINVAL; - current->no_new_privs = 1; + task_set_no_new_privs(current); break; case PR_GET_NO_NEW_PRIVS: if (arg2 || arg3 || arg4 || arg5) return -EINVAL; - return current->no_new_privs ? 1 : 0; + return task_no_new_privs(current) ? 1 : 0; case PR_GET_THP_DISABLE: if (arg2 || arg3 || arg4 || arg5) return -EINVAL; |