userns: Fix build of drivers/staging/dgrp
Explicitly test for GLOBAL_ROOT_UID and GLOBAL_ROOT_GID instead of using 0, allowing dgrp to compile and work properly when user namespace support is enabled. Cc: Bill Pemberton <wfp5p@virginia.edu> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
parent
88265322c1
commit
702e490211
1 changed files with 2 additions and 2 deletions
|
@ -179,9 +179,9 @@ void dgrp_carrier(struct ch_struct *ch)
|
|||
*/
|
||||
int dgrp_chk_perm(int mode, int op)
|
||||
{
|
||||
if (!current_euid())
|
||||
if (!uid_eq(GLOBAL_ROOT_UID, current_euid()))
|
||||
mode >>= 6;
|
||||
else if (in_egroup_p(0))
|
||||
else if (in_egroup_p(GLOBAL_ROOT_GID))
|
||||
mode >>= 3;
|
||||
|
||||
if ((mode & op & 0007) == op)
|
||||
|
|
Loading…
Reference in a new issue