diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2013-03-20 12:49:49 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2013-08-30 23:44:11 -0700 |
| commit | c7b96acf1456ef127fef461fcfedb54b81fecfbb (patch) | |
| tree | 1cc9387d23e96685453e545bda6d5a5efea8fa63 /kernel/uid16.c | |
| parent | f54fb863c6bbcbafdfc332b4a4260abb5a002137 (diff) | |
| download | op-kernel-dev-c7b96acf1456ef127fef461fcfedb54b81fecfbb.zip op-kernel-dev-c7b96acf1456ef127fef461fcfedb54b81fecfbb.tar.gz | |
userns: Kill nsown_capable it makes the wrong thing easy
nsown_capable is a special case of ns_capable essentially for just CAP_SETUID and
CAP_SETGID. For the existing users it doesn't noticably simplify things and
from the suggested patches I have seen it encourages people to do the wrong
thing. So remove nsown_capable.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel/uid16.c')
| -rw-r--r-- | kernel/uid16.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/uid16.c b/kernel/uid16.c index f6c83d7..602e5bb 100644 --- a/kernel/uid16.c +++ b/kernel/uid16.c @@ -176,7 +176,7 @@ SYSCALL_DEFINE2(setgroups16, int, gidsetsize, old_gid_t __user *, grouplist) struct group_info *group_info; int retval; - if (!nsown_capable(CAP_SETGID)) + if (!ns_capable(current_user_ns(), CAP_SETGID)) return -EPERM; if ((unsigned)gidsetsize > NGROUPS_MAX) return -EINVAL; |
