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

torvalds · torvalds · commit 5c6207539aea · 2019-07-31T13:26:54.000-07:00
Pull mount_capable() fix from Al Viro.

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  Unbreak mount_capable()
diff --git a/fs/super.c b/fs/super.c
@@ -478,13 +478,10 @@ EXPORT_SYMBOL(generic_shutdown_super);
 
 bool mount_capable(struct fs_context *fc)
 {
-	struct user_namespace *user_ns = fc->global ? &init_user_ns
-						    : fc->user_ns;
-
 	if (!(fc->fs_type->fs_flags & FS_USERNS_MOUNT))
 		return capable(CAP_SYS_ADMIN);
 	else
-		return ns_capable(user_ns, CAP_SYS_ADMIN);
+		return ns_capable(fc->user_ns, CAP_SYS_ADMIN);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -478,13 +478,10 @@ EXPORT_SYMBOL(generic_shutdown_super);`
`478`	`478`
`479`	`479`	`bool mount_capable(struct fs_context *fc)`
`480`	`480`	`{`
`481`		`- struct user_namespace *user_ns = fc->global ? &init_user_ns`
`482`		`- : fc->user_ns;`
`483`		`-`
`484`	`481`	`if (!(fc->fs_type->fs_flags & FS_USERNS_MOUNT))`
`485`	`482`	`return capable(CAP_SYS_ADMIN);`
`486`	`483`	`else`
`487`		`- return ns_capable(user_ns, CAP_SYS_ADMIN);`
	`484`	`+ return ns_capable(fc->user_ns, CAP_SYS_ADMIN);`
`488`	`485`	`}`
`489`	`486`
`490`	`487`	`/**`