diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-04 01:09:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-04 01:09:09 +0200 |
| commit | 3a494318b14b1bc0f59d2d6ce84c505c74d82d2a (patch) | |
| tree | 68918bebe684be45630061e10b036132e9db7198 | |
| parent | firmware: teach the kernel to load firmware files directly from the filesystem (diff) | |
| parent | userns: Fix build of drivers/staging/dgrp (diff) | |
| download | linux-3a494318b14b1bc0f59d2d6ce84c505c74d82d2a.tar.xz linux-3a494318b14b1bc0f59d2d6ce84c505c74d82d2a.zip | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |