All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christian Brauner <brauner@kernel.org>
To: Christoph Hellwig <hch@lst.de>, Chris Mason <clm@fb.com>,
	Josef Bacik <josef@toxicpanda.com>,
	David Sterba <dsterba@suse.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
	linux-btrfs@vger.kernel.org,
	Christian Brauner <christian.brauner@ubuntu.com>,
	Christoph Hellwig <hch@infradead.org>
Subject: [PATCH v4 16/21] btrfs/ioctl: allow idmapped BTRFS_IOC_SET_RECEIVED_SUBVOL{_32} ioctl
Date: Tue, 27 Jul 2021 12:48:55 +0200	[thread overview]
Message-ID: <20210727104900.829215-17-brauner@kernel.org> (raw)
In-Reply-To: <20210727104900.829215-1-brauner@kernel.org>

From: Christian Brauner <christian.brauner@ubuntu.com>

The BTRFS_IOC_SET_RECEIVED_SUBVOL{_32} are used to set information about a
received subvolume. Make it possible to set information about a received
subvolume on idmapped mounts. This is a fairly straightforward operation since
all the permission checking helpers are already capable of handling idmapped
mounts. So we just need to pass down the mount's userns.

Cc: Chris Mason <clm@fb.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: David Sterba <dsterba@suse.com>
Cc: linux-btrfs@vger.kernel.org
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
/* v2 */
unchanged

/* v3 */
unchanged

/* v4 */
unchanged
---
 fs/btrfs/ioctl.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 5a8df000cc41..c330b1b252a1 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4464,6 +4464,7 @@ static long btrfs_ioctl_quota_rescan_wait(struct btrfs_fs_info *fs_info,
 }
 
 static long _btrfs_ioctl_set_received_subvol(struct file *file,
+					    struct user_namespace *mnt_userns,
 					    struct btrfs_ioctl_received_subvol_args *sa)
 {
 	struct inode *inode = file_inode(file);
@@ -4475,7 +4476,7 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
 	int ret = 0;
 	int received_uuid_changed;
 
-	if (!inode_owner_or_capable(&init_user_ns, inode))
+	if (!inode_owner_or_capable(mnt_userns, inode))
 		return -EPERM;
 
 	ret = mnt_want_write_file(file);
@@ -4580,7 +4581,7 @@ static long btrfs_ioctl_set_received_subvol_32(struct file *file,
 	args64->rtime.nsec = args32->rtime.nsec;
 	args64->flags = args32->flags;
 
-	ret = _btrfs_ioctl_set_received_subvol(file, args64);
+	ret = _btrfs_ioctl_set_received_subvol(file, file_mnt_user_ns(file), args64);
 	if (ret)
 		goto out;
 
@@ -4614,7 +4615,7 @@ static long btrfs_ioctl_set_received_subvol(struct file *file,
 	if (IS_ERR(sa))
 		return PTR_ERR(sa);
 
-	ret = _btrfs_ioctl_set_received_subvol(file, sa);
+	ret = _btrfs_ioctl_set_received_subvol(file, file_mnt_user_ns(file), sa);
 
 	if (ret)
 		goto out;
-- 
2.30.2


  parent reply	other threads:[~2021-07-27 10:51 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-27 10:48 [PATCH v4 00/21] btrfs: support idmapped mounts Christian Brauner
2021-07-27 10:48 ` [PATCH v4 01/21] namei: add mapping aware lookup helper Christian Brauner
2021-08-02 12:24   ` Christian Brauner
2021-08-10 13:42   ` Christoph Hellwig
2021-07-27 10:48 ` [PATCH v4 02/21] btrfs/inode: handle idmaps in btrfs_new_inode() Christian Brauner
2021-07-27 10:48 ` [PATCH v4 03/21] btrfs/inode: allow idmapped rename iop Christian Brauner
2021-07-27 10:48 ` [PATCH v4 04/21] btrfs/inode: allow idmapped getattr iop Christian Brauner
2021-07-27 10:48 ` [PATCH v4 05/21] btrfs/inode: allow idmapped mknod iop Christian Brauner
2021-07-27 10:48 ` [PATCH v4 06/21] btrfs/inode: allow idmapped create iop Christian Brauner
2021-07-27 10:48 ` [PATCH v4 07/21] btrfs/inode: allow idmapped mkdir iop Christian Brauner
2021-07-27 10:48 ` [PATCH v4 08/21] btrfs/inode: allow idmapped symlink iop Christian Brauner
2021-07-27 10:48 ` [PATCH v4 09/21] btrfs/inode: allow idmapped tmpfile iop Christian Brauner
2021-07-27 10:48 ` [PATCH v4 10/21] btrfs/inode: allow idmapped setattr iop Christian Brauner
2021-07-27 10:48 ` [PATCH v4 11/21] btrfs/inode: allow idmapped permission iop Christian Brauner
2021-07-27 10:48 ` [PATCH v4 12/21] btrfs/ioctl: check whether fs{g,u}id are mapped during subvolume creation Christian Brauner
2021-07-27 10:48 ` [PATCH v4 13/21] btrfs/inode: allow idmapped BTRFS_IOC_{SNAP,SUBVOL}_CREATE{_V2} ioctl Christian Brauner
2021-07-27 10:48 ` [PATCH v4 14/21] btrfs/ioctl: allow idmapped BTRFS_IOC_SNAP_DESTROY{_V2} ioctl Christian Brauner
2021-07-27 10:48 ` [PATCH v4 15/21] btrfs/ioctl: relax restrictions for BTRFS_IOC_SNAP_DESTROY_V2 with subvolids Christian Brauner
2021-07-27 10:48 ` Christian Brauner [this message]
2021-07-27 10:48 ` [PATCH v4 17/21] btrfs/ioctl: allow idmapped BTRFS_IOC_SUBVOL_SETFLAGS ioctl Christian Brauner
2021-07-27 10:48 ` [PATCH v4 18/21] btrfs/ioctl: allow idmapped BTRFS_IOC_INO_LOOKUP_USER ioctl Christian Brauner
2021-07-27 10:48 ` [PATCH v4 19/21] btrfs/acl: handle idmapped mounts Christian Brauner
2021-07-27 10:48 ` [PATCH v4 20/21] btrfs/super: allow idmapped btrfs Christian Brauner
2021-07-27 10:49 ` [PATCH v4 21/21] btrfs/242: introduce btrfs specific idmapped mounts tests Christian Brauner
2021-08-02 12:28 ` [PATCH v4 00/21] btrfs: support idmapped mounts Christian Brauner
2021-08-09 10:12   ` Christian Brauner
2021-08-09 14:44   ` David Sterba
2021-08-09 15:20     ` Christian Brauner
2021-08-11 10:12       ` David Sterba
2021-08-11 10:43         ` Christian Brauner
2021-08-11 10:52           ` David Sterba
2021-08-11 13:29             ` Christian Brauner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210727104900.829215-17-brauner@kernel.org \
    --to=brauner@kernel.org \
    --cc=christian.brauner@ubuntu.com \
    --cc=clm@fb.com \
    --cc=dsterba@suse.com \
    --cc=hch@infradead.org \
    --cc=hch@lst.de \
    --cc=josef@toxicpanda.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.