git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git]
/
kernel
/
seccomp.c
diff --git
a/kernel/seccomp.c
b/kernel/seccomp.c
index a43c601ac252a7591c0464c9ef58162c94285ae0..54a0347ca8128f09cdbbcc83e2e8f8eea633a7ab 100644
(file)
--- a/
kernel/seccomp.c
+++ b/
kernel/seccomp.c
@@
-445,8
+445,8
@@
static struct seccomp_filter *seccomp_prepare_filter(struct sock_fprog *fprog)
* behavior of privileged children.
*/
if (!task_no_new_privs(current) &&
* behavior of privileged children.
*/
if (!task_no_new_privs(current) &&
- security_capable
_noaudit
(current_cred(), current_user_ns(),
- CAP_SYS_ADMIN) != 0)
+ security_capable(current_cred(), current_user_ns(),
+ CAP_SYS_ADMIN
, CAP_OPT_NOAUDIT
) != 0)
return ERR_PTR(-EACCES);
/* Allocate a new seccomp_filter */
return ERR_PTR(-EACCES);
/* Allocate a new seccomp_filter */