Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[firefly-linux-kernel-4.4.55.git] / kernel / groups.c

diff --git a/kernel/groups.c b/kernel/groups.c
index 253dc0f35cf4c30786d1ff3565427d1374762a04..1cc476d52dd3b6e477ebd2d70a0d97b61219f189 100644 (file)
--- a/kernel/groups.c
+++ b/kernel/groups.c
@@ -233,7 +233,7 @@ SYSCALL_DEFINE2(setgroups, int, gidsetsize, gid_t __user *, grouplist)
        struct group_info *group_info;
        int retval;
 
-       if (!capable(CAP_SETGID))
+       if (!nsown_capable(CAP_SETGID))
                return -EPERM;
        if ((unsigned)gidsetsize > NGROUPS_MAX)
                return -EINVAL;