summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-03 16:09:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-03 16:09:09 -0700
commit3a494318b14b1bc0f59d2d6ce84c505c74d82d2a (patch)
tree68918bebe684be45630061e10b036132e9db7198
parentabb139e75c2cdbb955e840d6331cb5863e409d0e (diff)
parent702e490211b2b7e448ebe1b3a07d97ad2fc07e03 (diff)
downloadop-kernel-dev-3a494318b14b1bc0f59d2d6ce84c505c74d82d2a.zip
op-kernel-dev-3a494318b14b1bc0f59d2d6ce84c505c74d82d2a.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull user namespace compile fix from Eric W Biederman: "This tree contains a trivial build fix for one of the staging drivers when user namespace support is enabled" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: userns: Fix build of 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 fce74e7..3553998 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)
OpenPOWER on IntegriCloud