Commit 92497350 authored Mar 16, 2019 by Linus Torvalds

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

parents 9c7dc824 ab81dabd

fs/sysfs/mount.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -71,9 +71,11 @@ static int sysfs_init_fs_context(struct fs_context *fc)
		kfc->magic = SYSFS_MAGIC;
		fc->fs_private = kfc;
		fc->ops = &sysfs_fs_context_ops;
		if (netns) {
		if (fc->user_ns)
		put_user_ns(fc->user_ns);
		fc->user_ns = get_user_ns(netns->user_ns);
		}
		fc->global = true;
		return 0;
		}

Admin message