Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2afe738f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'userns-linus' of... 

Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull userns updates from Eric Biederman:
 "Between the holidays and other distractions only a small amount of
  namespace work made it into my tree this time.

  Just a final cleanup from a revert several kernels ago and a small
  typo fix from Wolffhardt Schwabe"

* 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  fix typo in assignment of fs default overflow gid
  autofs4: Modify autofs_wait to use current_uid() and current_gid()
  userns: Don't fail follow_automount based on s_user_ns
parents d4173023 8b2770a4

fs/autofs4/waitq.c

+2 −2
Original line number Diff line number Diff line
@@ -442,8 +442,8 @@ int autofs4_wait(struct autofs_sb_info *sbi, 
		memcpy(&wq->name, &qstr, sizeof(struct qstr));

		wq->dev = autofs4_get_dev(sbi);

		wq->ino = autofs4_get_ino(sbi);

		wq->uid = current_cred()->uid;

		wq->gid = current_cred()->gid;

		wq->uid = current_uid();

		wq->gid = current_gid();

		wq->pid = pid;

		wq->tgid = tgid;

		wq->status = -EINTR; /* Status return if interrupted */

fs/namei.c

+0 −3
Original line number Diff line number Diff line
@@ -1133,9 +1133,6 @@ static int follow_automount(struct path *path, struct nameidata *nd, 
	    path->dentry->d_inode)

		return -EISDIR;



	if (path->dentry->d_sb->s_user_ns != &init_user_ns)

		return -EACCES;



	nd->total_link_count++;

	if (nd->total_link_count >= 40)

		return -ELOOP;

kernel/sys.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ EXPORT_SYMBOL(overflowgid); 
 */



int fs_overflowuid = DEFAULT_FS_OVERFLOWUID;

int fs_overflowgid = DEFAULT_FS_OVERFLOWUID;

int fs_overflowgid = DEFAULT_FS_OVERFLOWGID;



EXPORT_SYMBOL(fs_overflowuid);

EXPORT_SYMBOL(fs_overflowgid);