tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs mount infrastructure fix from Al Viro:
"Fixup for sysfs braino.

Capabilities checks for sysfs mount do include those on netns, but
only if CONFIG_NET_NS is enabled. Sorry, should've caught that
earlier..."

* 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fix sysfs_init_fs_context() in !CONFIG_NET_NS case

Linus Torvalds 92497350 9c7dc824

+5 -3
+5 -3
fs/sysfs/mount.c
··· 71 71 kfc->magic = SYSFS_MAGIC; 72 72 fc->fs_private = kfc; 73 73 fc->ops = &sysfs_fs_context_ops; 74 - if (fc->user_ns) 75 - put_user_ns(fc->user_ns); 76 - fc->user_ns = get_user_ns(netns->user_ns); 74 + if (netns) { 75 + if (fc->user_ns) 76 + put_user_ns(fc->user_ns); 77 + fc->user_ns = get_user_ns(netns->user_ns); 78 + } 77 79 fc->global = true; 78 80 return 0; 79 81 }