diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 14:43:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 14:43:12 -0800 |
| commit | 2afe738fc070bf681227c0c9d95b9cd0c4782b0f (patch) | |
| tree | 7828986318aef18865e70e9d160855f47ccb1b54 /fs/namei.c | |
| parent | d4173023e63cb85ec02eda02d1789bf078719f00 (diff) | |
| parent | 8b2770a4e1c7a837e1889d4f00026e999da5faa0 (diff) | |
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
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c index 9cc91fb7f156..4e3fc58dae72 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -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; |