Commit 3a494318 authored Oct 03, 2012 by Linus Torvalds

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

parents abb139e7 702e4902

drivers/staging/dgrp/dgrp_common.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)