projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
userns: Kill nsown_capable it makes the wrong thing easy
[linux-2.6-block.git]
/
ipc
/
namespace.c
diff --git
a/ipc/namespace.c
b/ipc/namespace.c
index 7ee61bf449332bbb556f4742e72c8f54c8111d89..4be6581d3b7fa075c3d899e889ce6d09e8fcca86 100644
(file)
--- a/
ipc/namespace.c
+++ b/
ipc/namespace.c
@@
-171,7
+171,7
@@
static int ipcns_install(struct nsproxy *nsproxy, void *new)
{
struct ipc_namespace *ns = new;
if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN) ||
- !ns
own_capable(
CAP_SYS_ADMIN))
+ !ns
_capable(current_user_ns(),
CAP_SYS_ADMIN))
return -EPERM;
/* Ditch state from the old ipc namespace */