[v6,19/40] fcntl: handle idmapped mounts

Commit Message

Christian Brauner Jan. 21, 2021, 1:19 p.m. UTC

Enable the setfl() helper to handle idmapped mounts by passing down the
mount's user namespace. If the initial user namespace is passed nothing
changes so non-idmapped mounts will see identical behavior as before.

Link: https://lore.kernel.org/r/[e-mail]
Cc: Christoph Hellwig <[e-mail]>
Cc: David Howells <[e-mail]>
Cc: Al Viro <[e-mail]>
Cc: [e-mail]
Reviewed-by: Christoph Hellwig <[e-mail]>
Signed-off-by: Christian Brauner <[e-mail]>
---
/* v2 */
patch introduced

/* v3 */
unchanged

/* v4 */
unchanged

/* v5 */
unchanged
base-commit: 7c53f6b671f4aba70ff15e1b05148b10d58c2837

/* v6 */
base-commit: 19c329f6808995b142b3966301f217c831e7cf31

- Christoph Hellwig <[e-mail]>:
  - Use file_mnt_user_ns() helper.
---
 fs/fcntl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

James Morris Jan. 22, 2021, 4:17 a.m. UTC | #1

On Thu, 21 Jan 2021, Christian Brauner wrote:

> Enable the setfl() helper to handle idmapped mounts by passing down the
> mount's user namespace. If the initial user namespace is passed nothing
> changes so non-idmapped mounts will see identical behavior as before.
> 
> Link: https://lore.kernel.org/r/[e-mail]
> Cc: Christoph Hellwig <[e-mail]>
> Cc: David Howells <[e-mail]>
> Cc: Al Viro <[e-mail]>
> Cc: [e-mail]
> Reviewed-by: Christoph Hellwig <[e-mail]>
> Signed-off-by: Christian Brauner <[e-mail]>


Reviewed-by: James Morris <[e-mail]>

Patch

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 74d99731fd43..f6ac5285060d 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -25,6 +25,7 @@ 
 #include <linux/user_namespace.h>
 #include <linux/memfd.h>
 #include <linux/compat.h>
+#include <linux/mount.h>
 
 #include <linux/poll.h>
 #include <asm/siginfo.h>
@@ -46,7 +47,7 @@  static int setfl(int fd, struct file * filp, unsigned long arg)
 
 	/* O_NOATIME can only be set by the owner or superuser */
 	if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
-		if (!inode_owner_or_capable(&init_user_ns, inode))
+		if (!inode_owner_or_capable(file_mnt_user_ns(filp), inode))
 			return -EPERM;
 
 	/* required for strict SunOS emulation */