Merge remote-tracking branches 'regulator/topic/max8649', 'regulator/topic/mode'...

[karo-tx-linux.git] / kernel / groups.c

diff --git a/kernel/groups.c b/kernel/groups.c
index 02d8a251c47656593690ceabd36ea42f42cc2cdb..664411f171b59a9cfb7a8b9c8c843ab1ea3a908b 100644 (file)
--- a/kernel/groups.c
+++ b/kernel/groups.c
@@ -6,6 +6,7 @@
 #include <linux/slab.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/user_namespace.h>
 #include <asm/uaccess.h>
 
 /* init to 2 - one for init_task, one to ensure it is never freed */
@@ -217,7 +218,8 @@ bool may_setgroups(void)
 {
        struct user_namespace *user_ns = current_user_ns();
 
-       return ns_capable(user_ns, CAP_SETGID);
+       return ns_capable(user_ns, CAP_SETGID) &&
+               userns_may_setgroups(user_ns);
 }
 
 /*