aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/dgrp
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-10-02 15:37:37 -0700
committerEric W. Biederman <ebiederm@xmission.com>2012-10-03 09:52:08 -0700
commit702e490211b2b7e448ebe1b3a07d97ad2fc07e03 (patch)
treeac90b7219b98a2fcdd1f9f9f95d7b8575706f3f4 /drivers/staging/dgrp
parent88265322c14cce39f7afbc416726ef4fac413298 (diff)
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>
Diffstat (limited to 'drivers/staging/dgrp')
-rw-r--r--drivers/staging/dgrp/dgrp_common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/dgrp/dgrp_common.c b/drivers/staging/dgrp/dgrp_common.c
index fce74e7fb83..3553998b72b 100644
--- a/drivers/staging/dgrp/dgrp_common.c
+++ b/drivers/staging/dgrp/dgrp_common.c
@@ -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)