.. | .. |
---|
20 | 20 | len = sizeof(struct group_info) + sizeof(kgid_t) * gidsetsize; |
---|
21 | 21 | gi = kmalloc(len, GFP_KERNEL_ACCOUNT|__GFP_NOWARN|__GFP_NORETRY); |
---|
22 | 22 | if (!gi) |
---|
23 | | - gi = __vmalloc(len, GFP_KERNEL_ACCOUNT, PAGE_KERNEL); |
---|
| 23 | + gi = __vmalloc(len, GFP_KERNEL_ACCOUNT); |
---|
24 | 24 | if (!gi) |
---|
25 | 25 | return NULL; |
---|
26 | 26 | |
---|
.. | .. |
---|
178 | 178 | { |
---|
179 | 179 | struct user_namespace *user_ns = current_user_ns(); |
---|
180 | 180 | |
---|
181 | | - return ns_capable(user_ns, CAP_SETGID) && |
---|
| 181 | + return ns_capable_setid(user_ns, CAP_SETGID) && |
---|
182 | 182 | userns_may_setgroups(user_ns); |
---|
183 | 183 | } |
---|
184 | 184 | |
---|