From 702e490211b2b7e448ebe1b3a07d97ad2fc07e03 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 2 Oct 2012 15:37:37 -0700 Subject: 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 Cc: Greg Kroah-Hartman Signed-off-by: "Eric W. Biederman" --- drivers/staging/dgrp/dgrp_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/staging') diff --git a/drivers/staging/dgrp/dgrp_common.c b/drivers/staging/dgrp/dgrp_common.c index fce74e7fb834..3553998b72bc 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) -- cgit v1.2.3-59-g8ed1b