From nobody Fri Dec 26 09:37:21 2025 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88D243FE44 for ; Mon, 8 Jan 2024 12:10:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="jy6tpFZh" Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id A2AF63F745 for ; Mon, 8 Jan 2024 12:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704715799; bh=GtdhYLDKs9o20JRSF0JGIkdiKLo4c8K8/G8DvoYAW44=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jy6tpFZhfYdMKPc2T1yw/AlsYk6up/wkEUIJGDNovxV5t6t5jdqH99sS/u2QstfSR XRWa6kEVslGqkz6HSenY6qhAQwB9IcvOsozqhqZBYKjdYqO1I5is1AT20cLWGcc0FR 94v1aUoxtjwlszZabirRWKWCYdZX0bhFYi6WlLjpDQm2WBR/bFAUFfSWbtfClfn//O HYp+zsuN3z6K9SWM59S7F6zwSeryFxcrUhRz9R4xH9DnBWmhChaqvMIQhjTWBVWyTj EERJcFeZ0B5GBr3iY+ZhC5k4HLCm7Q6D8+ZlQf2QDVC/oM6ycmcp6tQub6dRFPTXk0 G114XajQD8jqA== Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-50e8b929997so868988e87.0 for ; Mon, 08 Jan 2024 04:09:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704715798; x=1705320598; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GtdhYLDKs9o20JRSF0JGIkdiKLo4c8K8/G8DvoYAW44=; b=ILsgLUPhFIunGJFN1tUDP5YLvuK26ZKkju6Q29Ru1rKb6MSy3OqpDzSOdrub8luKtk nPFO81v94RrKkXj3/ITXTT0/4yuc6yFuJ/ylsknuvZcRfG6lts45McYJCZFBqTJ25ejf zVCcETq+Pi98aIwnj+mmakdp2ACfJeFS6sL1RGbg28Ugh5cX9V/eXW+387kvA1d+z/Sg VqaQIgJH8kry8+LlHqXZD8CjHu3qRZ34pqJ1DbRHH62ykDBlwR1IVnLqNBbPV2vSH8zI fZxzXMyzDxcBmtl3RDrfz2M6nPpEkV0BvI1ictL1DAeROGNzvlxC5Qeht9kaVNW6P3FD CTHg== X-Gm-Message-State: AOJu0YwDWlqwAY6EuHRvwwXhTVTGc6eyn/Rq3sGzR3vRu6+/0tSpkBeu 6fTBU31ue4axSyfh5X260T5JAxh0ex2tR9XMjuPyLJdCWmXF4Qljo/rz4Hr1tLGX6WShQzRg0Pq +4I+Jv7qpKcymGKrzlft3YBdEaLmfy2wwdfbDEAUJoFXOwA8k X-Received: by 2002:a05:6512:10d6:b0:50e:75ee:ec46 with SMTP id k22-20020a05651210d600b0050e75eeec46mr795193lfg.2.1704715798664; Mon, 08 Jan 2024 04:09:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFUqcUNjknvfP6Ue7/xRuCDchF5ew85PuPQCa7e/qAm97tSZSidsvc4p703nLWJuX0caRvEzw== X-Received: by 2002:a05:6512:10d6:b0:50e:75ee:ec46 with SMTP id k22-20020a05651210d600b0050e75eeec46mr795186lfg.2.1704715798368; Mon, 08 Jan 2024 04:09:58 -0800 (PST) Received: from localhost.localdomain ([91.64.72.41]) by smtp.gmail.com with ESMTPSA id fi21-20020a056402551500b005578b816f20sm1767959edb.29.2024.01.08.04.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 04:09:57 -0800 (PST) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, stgraber@stgraber.org, linux-fsdevel@vger.kernel.org, Seth Forshee , Miklos Szeredi , Amir Goldstein , Bernd Schubert , Alexander Mikhalitsyn , Alexander Viro , linux-kernel@vger.kernel.org Subject: [PATCH v1 1/9] fs/namespace: introduce fs_type->allow_idmap hook Date: Mon, 8 Jan 2024 13:08:16 +0100 Message-Id: <20240108120824.122178-2-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> References: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Right now we determine if filesystem support vfs idmappings or not basing on the FS_ALLOW_IDMAP flag presence. This "static" way works perfecly well for local filesystems like ext4, xfs, btrfs, etc. But for network-like filesystems like fuse, cephfs this approach is not ideal, because sometimes proper support of vfs idmaps requires some extensions for the on-wire protocol, which implies that changes have to be made not only in the Linux kernel code but also in the 3rd party components like libfuse, cephfs MDS server and so on. We have seen that issue during our work on cephfs idmapped mounts [1] with Christian, but right now I'm working on the idmapped mounts support for fuse and I think that it is a right time for this extension. [1] 5ccd8530dd7 ("ceph: handle idmapped mounts in create_request_message()") Cc: Christian Brauner Cc: Seth Forshee Cc: Miklos Szeredi Cc: Amir Goldstein Cc: Bernd Schubert Cc: Signed-off-by: Alexander Mikhalitsyn --- fs/namespace.c | 3 ++- include/linux/fs.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/namespace.c b/fs/namespace.c index fbf0e596fcd3..02eb47b3d728 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -4300,7 +4300,8 @@ static int can_idmap_mount(const struct mount_kattr *= kattr, struct mount *mnt) return -EPERM; =20 /* The underlying filesystem doesn't support idmapped mounts yet. */ - if (!(m->mnt_sb->s_type->fs_flags & FS_ALLOW_IDMAP)) + if (!(m->mnt_sb->s_type->fs_flags & FS_ALLOW_IDMAP) || + (m->mnt_sb->s_type->allow_idmap && !m->mnt_sb->s_type->allow_idmap(m-= >mnt_sb))) return -EINVAL; =20 /* We're not controlling the superblock. */ diff --git a/include/linux/fs.h b/include/linux/fs.h index 98b7a7a8c42e..f2e373b5420a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2377,6 +2377,7 @@ struct file_system_type { #define FS_RENAME_DOES_D_MOVE 32768 /* FS will handle d_move() during rena= me() internally. */ int (*init_fs_context)(struct fs_context *); const struct fs_parameter_spec *parameters; + bool (*allow_idmap)(struct super_block *); struct dentry *(*mount) (struct file_system_type *, int, const char *, void *); void (*kill_sb) (struct super_block *); --=20 2.34.1 From nobody Fri Dec 26 09:37:21 2025 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C86D3405DE for ; Mon, 8 Jan 2024 12:10:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="HPWJVlBJ" Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id B17463F743 for ; Mon, 8 Jan 2024 12:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704715805; bh=mr8sbzdAtqXe7/XkmKXPwVfGObhH4DN7fFUmLFyq+MA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HPWJVlBJuS2/jrNzHxbrlHJeBlg0hB9uxPmoWr1lzlCKwNhiSSUcM6lMs7R6tUzJq r3dQPNXoFixG2MCxScHs/Ooh/omTc8eYp18PD6dUtFh/w3IoQwo9/pkFutETLfcgM5 cUWY0mBK4BZTE21tamOYrxNiW6fZmma/ZsjLUhmVN/Lp41+7Ag88rcuKBd//XA+oL6 aBDnL66zlZf74d5+59eXBf1nlP8aXoLxgafBMfjIgO5fFyy4QVW7ZQEjVLOf9dhwAv 5A/jyX0rI69gJwy2bTDYtBCGY4Ian4DzGLSCjZVDmzg9yugxM+s9NdguDQjJn07p2H eYxZleO7MU/Yw== Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-50e5195db01so1062833e87.3 for ; Mon, 08 Jan 2024 04:10:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704715805; x=1705320605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mr8sbzdAtqXe7/XkmKXPwVfGObhH4DN7fFUmLFyq+MA=; b=NYKVVIjTJyYRA0y+yCGp7uIjFyZHz8cRdXsXmOKVjSaxMI9EjQ+IORqr9ntHXD5AcM RHaAgAxL9CgeTL+GMN55rNld+z645B3UK1tPeH/c8GfY11lZLntEIA9CuFu+InQeriSO /0TcUBmXV1cES7KJizxN56/8+4I6h8DAPJvlzd5RF+i2Ay2lLLpu8EdbCvOKDclkdT69 iZie01g8EsgbKCHovgmrtrXun/NT5H6NRWkqVKraMK5NSQ2NCY0WsM2G+Lxp4wsEhgci FenWMQ1O9Fdj07H1InvSrGAvPncStlGu5RHaHRWBjwAxExU2X4ZywK3r5qBMzfwCGkLi u/Bw== X-Gm-Message-State: AOJu0YzhgWHBU+lbKuuZxG//Mkwj/72zWQ7fJe7yjsPqCnudWhf+ogon C9ZkBfOiMJ+fXatlFrsD0Lz2/SHf4z8YmNOX26ppDajZYMChpDVd2l/+IaYRqebnPfrOhQGMCPs 2nnWk+KL7H8i09TMYgdDDgFntn+k2C6e9xdXlS9bL2GGgC7yp X-Received: by 2002:ac2:5e33:0:b0:50e:52ea:771e with SMTP id o19-20020ac25e33000000b0050e52ea771emr1121325lfg.138.1704715805174; Mon, 08 Jan 2024 04:10:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IG6BVLmg1QflPR2yuZVRfqVUwsYwwfsK2JxDahvi3YR/nFvwf+wHlCc+2CTfXr7thdLqTc/fg== X-Received: by 2002:ac2:5e33:0:b0:50e:52ea:771e with SMTP id o19-20020ac25e33000000b0050e52ea771emr1121313lfg.138.1704715804894; Mon, 08 Jan 2024 04:10:04 -0800 (PST) Received: from localhost.localdomain ([91.64.72.41]) by smtp.gmail.com with ESMTPSA id fi21-20020a056402551500b005578b816f20sm1767959edb.29.2024.01.08.04.10.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 04:10:04 -0800 (PST) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, stgraber@stgraber.org, linux-fsdevel@vger.kernel.org, Miklos Szeredi , Seth Forshee , Amir Goldstein , Bernd Schubert , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v1 2/9] fs/fuse: add FUSE_OWNER_UID_GID_EXT extension Date: Mon, 8 Jan 2024 13:08:17 +0100 Message-Id: <20240108120824.122178-3-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> References: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To properly support vfs idmappings we need to provide a fuse daemon with the correct owner uid/gid for inode creation requests like mkdir, mknod, atomic_open, symlink. Right now, fuse daemons use req->in.h.uid/req->in.h.gid to set inode owner. These fields contain fsuid/fsgid of the syscall's caller. And that's perfectly fine, because inode owner have to be set to these values. But, for idmapped mounts it's not the case and caller fsuid/fsgid !=3D inode owner, because idmapped mounts do nothing with the caller fsuid/fsgid, but affect inode owner uid/gid. It means that we can't apply vfsid mapping to caller fsuid/fsgid, but instead we have to introduce a new fields to store inode owner uid/gid which will be appropriately transformed. Christian and I have done the same to support idmapped mounts in the cephfs recently [1]. [1] 5ccd8530 ("ceph: handle idmapped mounts in create_request_message()") Cc: Miklos Szeredi Cc: Christian Brauner Cc: Seth Forshee Cc: Amir Goldstein Cc: Bernd Schubert Cc: Signed-off-by: Alexander Mikhalitsyn --- fs/fuse/dir.c | 34 +++++++++++++++++++++++++++++++--- fs/fuse/fuse_i.h | 3 +++ fs/fuse/inode.c | 4 +++- include/uapi/linux/fuse.h | 19 +++++++++++++++++++ 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 6f5f9ff95380..e78ad4742aef 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -568,7 +568,33 @@ static int get_create_supp_group(struct inode *dir, st= ruct fuse_in_arg *ext) return 0; } =20 -static int get_create_ext(struct fuse_args *args, +static int get_owner_uid_gid(struct mnt_idmap *idmap, struct fuse_conn *fc= , struct fuse_in_arg *ext) +{ + struct fuse_ext_header *xh; + struct fuse_owner_uid_gid *owner_creds; + u32 owner_creds_len =3D fuse_ext_size(sizeof(*owner_creds)); + kuid_t owner_fsuid; + kgid_t owner_fsgid; + + xh =3D extend_arg(ext, owner_creds_len); + if (!xh) + return -ENOMEM; + + xh->size =3D owner_creds_len; + xh->type =3D FUSE_EXT_OWNER_UID_GID; + + owner_creds =3D (struct fuse_owner_uid_gid *) &xh[1]; + + owner_fsuid =3D mapped_fsuid(idmap, fc->user_ns); + owner_fsgid =3D mapped_fsgid(idmap, fc->user_ns); + owner_creds->uid =3D from_kuid(fc->user_ns, owner_fsuid); + owner_creds->gid =3D from_kgid(fc->user_ns, owner_fsgid); + + return 0; +} + +static int get_create_ext(struct mnt_idmap *idmap, + struct fuse_args *args, struct inode *dir, struct dentry *dentry, umode_t mode) { @@ -580,6 +606,8 @@ static int get_create_ext(struct fuse_args *args, err =3D get_security_context(dentry, mode, &ext); if (!err && fc->create_supp_group) err =3D get_create_supp_group(dir, &ext); + if (!err && fc->owner_uid_gid_ext) + err =3D get_owner_uid_gid(idmap, fc, &ext); =20 if (!err && ext.size) { WARN_ON(args->in_numargs >=3D ARRAY_SIZE(args->in_args)); @@ -662,7 +690,7 @@ static int fuse_create_open(struct inode *dir, struct d= entry *entry, args.out_args[1].size =3D sizeof(outopen); args.out_args[1].value =3D &outopen; =20 - err =3D get_create_ext(&args, dir, entry, mode); + err =3D get_create_ext(&nop_mnt_idmap, &args, dir, entry, mode); if (err) goto out_put_forget_req; =20 @@ -790,7 +818,7 @@ static int create_new_entry(struct fuse_mount *fm, stru= ct fuse_args *args, args->out_args[0].value =3D &outarg; =20 if (args->opcode !=3D FUSE_LINK) { - err =3D get_create_ext(args, dir, entry, mode); + err =3D get_create_ext(&nop_mnt_idmap, args, dir, entry, mode); if (err) goto out_put_forget_req; } diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 1df83eebda92..15ec95dea276 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -806,6 +806,9 @@ struct fuse_conn { /* Add supplementary group info when creating a new inode */ unsigned int create_supp_group:1; =20 + /* Add owner_{u,g}id info when creating a new inode */ + unsigned int owner_uid_gid_ext:1; + /* Does the filesystem support per inode DAX? */ unsigned int inode_dax:1; =20 diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index ab824a8908b7..08cd3714b32d 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1284,6 +1284,8 @@ static void process_init_reply(struct fuse_mount *fm,= struct fuse_args *args, fc->create_supp_group =3D 1; if (flags & FUSE_DIRECT_IO_ALLOW_MMAP) fc->direct_io_allow_mmap =3D 1; + if (flags & FUSE_OWNER_UID_GID_EXT) + fc->owner_uid_gid_ext =3D 1; } else { ra_pages =3D fc->max_read / PAGE_SIZE; fc->no_lock =3D 1; @@ -1330,7 +1332,7 @@ void fuse_send_init(struct fuse_mount *fm) FUSE_NO_OPENDIR_SUPPORT | FUSE_EXPLICIT_INVAL_DATA | FUSE_HANDLE_KILLPRIV_V2 | FUSE_SETXATTR_EXT | FUSE_INIT_EXT | FUSE_SECURITY_CTX | FUSE_CREATE_SUPP_GROUP | - FUSE_HAS_EXPIRE_ONLY | FUSE_DIRECT_IO_ALLOW_MMAP; + FUSE_HAS_EXPIRE_ONLY | FUSE_DIRECT_IO_ALLOW_MMAP | FUSE_OWNER_UID_GID_EX= T; #ifdef CONFIG_FUSE_DAX if (fm->fc->dax) flags |=3D FUSE_MAP_ALIGNMENT; diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index e7418d15fe39..ebe82104b172 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -211,6 +211,10 @@ * 7.39 * - add FUSE_DIRECT_IO_ALLOW_MMAP * - add FUSE_STATX and related structures + * + * 7.40 + * - add FUSE_EXT_OWNER_UID_GID + * - add FUSE_OWNER_UID_GID_EXT */ =20 #ifndef _LINUX_FUSE_H @@ -410,6 +414,8 @@ struct fuse_file_lock { * symlink and mknod (single group that matches parent) * FUSE_HAS_EXPIRE_ONLY: kernel supports expiry-only entry invalidation * FUSE_DIRECT_IO_ALLOW_MMAP: allow shared mmap in FOPEN_DIRECT_IO mode. + * FUSE_OWNER_UID_GID_EXT: add inode owner UID/GID info to create, mkdir, + * symlink and mknod */ #define FUSE_ASYNC_READ (1 << 0) #define FUSE_POSIX_LOCKS (1 << 1) @@ -452,6 +458,7 @@ struct fuse_file_lock { =20 /* Obsolete alias for FUSE_DIRECT_IO_ALLOW_MMAP */ #define FUSE_DIRECT_IO_RELAX FUSE_DIRECT_IO_ALLOW_MMAP +#define FUSE_OWNER_UID_GID_EXT (1ULL << 37) =20 /** * CUSE INIT request/reply flags @@ -561,11 +568,13 @@ struct fuse_file_lock { * extension type * FUSE_MAX_NR_SECCTX: maximum value of &fuse_secctx_header.nr_secctx * FUSE_EXT_GROUPS: &fuse_supp_groups extension + * FUSE_EXT_OWNER_UID_GID: &fuse_owner_uid_gid extension */ enum fuse_ext_type { /* Types 0..31 are reserved for fuse_secctx_header */ FUSE_MAX_NR_SECCTX =3D 31, FUSE_EXT_GROUPS =3D 32, + FUSE_EXT_OWNER_UID_GID =3D 33, }; =20 enum fuse_opcode { @@ -1153,4 +1162,14 @@ struct fuse_supp_groups { uint32_t groups[]; }; =20 +/** + * struct fuse_owner_uid_gid - Inode owner UID/GID extension + * @uid: inode owner UID + * @gid: inode owner GID + */ +struct fuse_owner_uid_gid { + uint32_t uid; + uint32_t gid; +}; + #endif /* _LINUX_FUSE_H */ --=20 2.34.1 From nobody Fri Dec 26 09:37:21 2025 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3A6840BE1 for ; Mon, 8 Jan 2024 12:10:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="Z7OPTZJq" Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id DBB9E3F45F for ; Mon, 8 Jan 2024 12:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704715808; bh=Qlcho8chuufL9JmbPqtNzk4zs+rMss6COIQOi9IfnOw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Z7OPTZJqsSTCPqB11nkcuok0NL+getiF4kfHK53/PNFHn4Uv6aemMR2Mi8FRhBfce OLeTmwjJvMdHJhOSD72VFNp7V5nSJGjB55xuSydr/h2o/reKMPLRVhzB4oTh1TbWhX 4xipx579TV4Pz8xvrVbGynKilJd/fqS3Erh+2EoylL417h74enGWvTvgHbxm4l9+tF 25pR/2l3JjaPAsxJ/fQH2W08XaKs7IBQfQ7VJQniQf48hg9hgufNKQbukv23+Um4mL E9DTG1mmSEyejnSCJlgdRJSDVkwLX65eGa4BoydvwG6o4xG5h1v6wfFPfgobN1CoKy kp8IKWpUGrfSg== Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2cccdcfea74so14473561fa.1 for ; Mon, 08 Jan 2024 04:10:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704715808; x=1705320608; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qlcho8chuufL9JmbPqtNzk4zs+rMss6COIQOi9IfnOw=; b=AsVgEgKJFA1Fa6R/plZeSCdTMaYZK/JjVhgsXH1gHxDS+hQZAWlz4L6IoiYvNvdrMQ 0dEb4HlSDwpTQooe61hFOeIu1ImZPcxyt9D+UQRRJqKSa+xGMHec1U2lUNjf4xmiyp7e MzfL2mYpz8DqQ4EFZzYdKw1/n8WiYzhhekBMsuSTJBac4XNly9pKcJesrNF3YX2RsZva RrnfI3E6XycxyJgAx4NJL2vKmTl6t6ASw5Zl6og02Yab1tkD+L2SZi72obI28r9/5y0H fborfjddAQpLNn+DIFW7rqgTfwLOO3ssF8kRYP4C4vE+w1P1nyZRZrLbo832b2q7ma/Z k7pg== X-Gm-Message-State: AOJu0YwZ39aTU1bIXy1TBQt1FC/ImVDL1qJGAP6Cwl5L85VIvOav8+mp 3OZ/Llh1fZZzYIRT/wQi8o4YuIjKHjGKc+EHoXU5BttxoHntUxgHlXrXPIfvsNtclZUEF4Jl0dT VOccms4dRtzZRe1+HS2zMlzCBo61sgkaz3VOv320Czxvtv0/b X-Received: by 2002:a2e:3005:0:b0:2cc:8545:d6f9 with SMTP id w5-20020a2e3005000000b002cc8545d6f9mr1455633ljw.15.1704715808314; Mon, 08 Jan 2024 04:10:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IE6Cz/42DbzT+orPD/r3QKq1nu0ZTzoybNkUSmzDw8l2XlSCl2Tn0YWn6jBVA8XteZl0oCtPw== X-Received: by 2002:a2e:3005:0:b0:2cc:8545:d6f9 with SMTP id w5-20020a2e3005000000b002cc8545d6f9mr1455623ljw.15.1704715808045; Mon, 08 Jan 2024 04:10:08 -0800 (PST) Received: from localhost.localdomain ([91.64.72.41]) by smtp.gmail.com with ESMTPSA id fi21-20020a056402551500b005578b816f20sm1767959edb.29.2024.01.08.04.10.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 04:10:07 -0800 (PST) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, stgraber@stgraber.org, linux-fsdevel@vger.kernel.org, Seth Forshee , Miklos Szeredi , Amir Goldstein , Bernd Schubert , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v1 3/9] fs/fuse: support idmap for mkdir/mknod/symlink/create Date: Mon, 8 Jan 2024 13:08:18 +0100 Message-Id: <20240108120824.122178-4-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> References: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We have all the infrastructure in place, we just need to pass an idmapping here. Cc: Christian Brauner Cc: Seth Forshee Cc: Miklos Szeredi Cc: Amir Goldstein Cc: Bernd Schubert Cc: Signed-off-by: Alexander Mikhalitsyn --- fs/fuse/dir.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index e78ad4742aef..a0968f086b62 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -633,9 +633,9 @@ static void free_ext_value(struct fuse_args *args) * If the filesystem doesn't support this, then fall back to separate * 'mknod' + 'open' requests. */ -static int fuse_create_open(struct inode *dir, struct dentry *entry, - struct file *file, unsigned int flags, - umode_t mode, u32 opcode) +static int fuse_create_open(struct mnt_idmap *idmap, struct inode *dir, + struct dentry *entry, struct file *file, + unsigned int flags, umode_t mode, u32 opcode) { int err; struct inode *inode; @@ -690,7 +690,7 @@ static int fuse_create_open(struct inode *dir, struct d= entry *entry, args.out_args[1].size =3D sizeof(outopen); args.out_args[1].value =3D &outopen; =20 - err =3D get_create_ext(&nop_mnt_idmap, &args, dir, entry, mode); + err =3D get_create_ext(idmap, &args, dir, entry, mode); if (err) goto out_put_forget_req; =20 @@ -749,6 +749,7 @@ static int fuse_atomic_open(struct inode *dir, struct d= entry *entry, umode_t mode) { int err; + struct mnt_idmap *idmap =3D file_mnt_idmap(file); struct fuse_conn *fc =3D get_fuse_conn(dir); struct dentry *res =3D NULL; =20 @@ -773,7 +774,7 @@ static int fuse_atomic_open(struct inode *dir, struct d= entry *entry, if (fc->no_create) goto mknod; =20 - err =3D fuse_create_open(dir, entry, file, flags, mode, FUSE_CREATE); + err =3D fuse_create_open(idmap, dir, entry, file, flags, mode, FUSE_CREAT= E); if (err =3D=3D -ENOSYS) { fc->no_create =3D 1; goto mknod; @@ -784,7 +785,7 @@ static int fuse_atomic_open(struct inode *dir, struct d= entry *entry, return err; =20 mknod: - err =3D fuse_mknod(&nop_mnt_idmap, dir, entry, mode, 0); + err =3D fuse_mknod(idmap, dir, entry, mode, 0); if (err) goto out_dput; no_open: @@ -794,9 +795,9 @@ static int fuse_atomic_open(struct inode *dir, struct d= entry *entry, /* * Code shared between mknod, mkdir, symlink and link */ -static int create_new_entry(struct fuse_mount *fm, struct fuse_args *args, - struct inode *dir, struct dentry *entry, - umode_t mode) +static int create_new_entry(struct mnt_idmap *idmap, struct fuse_mount *fm, + struct fuse_args *args, struct inode *dir, + struct dentry *entry, umode_t mode) { struct fuse_entry_out outarg; struct inode *inode; @@ -818,7 +819,7 @@ static int create_new_entry(struct fuse_mount *fm, stru= ct fuse_args *args, args->out_args[0].value =3D &outarg; =20 if (args->opcode !=3D FUSE_LINK) { - err =3D get_create_ext(&nop_mnt_idmap, args, dir, entry, mode); + err =3D get_create_ext(idmap, args, dir, entry, mode); if (err) goto out_put_forget_req; } @@ -884,13 +885,13 @@ static int fuse_mknod(struct mnt_idmap *idmap, struct= inode *dir, args.in_args[0].value =3D &inarg; args.in_args[1].size =3D entry->d_name.len + 1; args.in_args[1].value =3D entry->d_name.name; - return create_new_entry(fm, &args, dir, entry, mode); + return create_new_entry(idmap, fm, &args, dir, entry, mode); } =20 static int fuse_create(struct mnt_idmap *idmap, struct inode *dir, struct dentry *entry, umode_t mode, bool excl) { - return fuse_mknod(&nop_mnt_idmap, dir, entry, mode, 0); + return fuse_mknod(idmap, dir, entry, mode, 0); } =20 static int fuse_tmpfile(struct mnt_idmap *idmap, struct inode *dir, @@ -902,7 +903,7 @@ static int fuse_tmpfile(struct mnt_idmap *idmap, struct= inode *dir, if (fc->no_tmpfile) return -EOPNOTSUPP; =20 - err =3D fuse_create_open(dir, file->f_path.dentry, file, file->f_flags, m= ode, FUSE_TMPFILE); + err =3D fuse_create_open(idmap, dir, file->f_path.dentry, file, file->f_f= lags, mode, FUSE_TMPFILE); if (err =3D=3D -ENOSYS) { fc->no_tmpfile =3D 1; err =3D -EOPNOTSUPP; @@ -929,7 +930,7 @@ static int fuse_mkdir(struct mnt_idmap *idmap, struct i= node *dir, args.in_args[0].value =3D &inarg; args.in_args[1].size =3D entry->d_name.len + 1; args.in_args[1].value =3D entry->d_name.name; - return create_new_entry(fm, &args, dir, entry, S_IFDIR); + return create_new_entry(idmap, fm, &args, dir, entry, S_IFDIR); } =20 static int fuse_symlink(struct mnt_idmap *idmap, struct inode *dir, @@ -945,7 +946,7 @@ static int fuse_symlink(struct mnt_idmap *idmap, struct= inode *dir, args.in_args[0].value =3D entry->d_name.name; args.in_args[1].size =3D len; args.in_args[1].value =3D link; - return create_new_entry(fm, &args, dir, entry, S_IFLNK); + return create_new_entry(idmap, fm, &args, dir, entry, S_IFLNK); } =20 void fuse_flush_time_update(struct inode *inode) @@ -1139,7 +1140,7 @@ static int fuse_link(struct dentry *entry, struct ino= de *newdir, args.in_args[0].value =3D &inarg; args.in_args[1].size =3D newent->d_name.len + 1; args.in_args[1].value =3D newent->d_name.name; - err =3D create_new_entry(fm, &args, newdir, newent, inode->i_mode); + err =3D create_new_entry(&nop_mnt_idmap, fm, &args, newdir, newent, inode= ->i_mode); if (!err) fuse_update_ctime_in_cache(inode); else if (err =3D=3D -EINTR) --=20 2.34.1 From nobody Fri Dec 26 09:37:21 2025 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5ECD940C00 for ; Mon, 8 Jan 2024 12:10:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="JARV6rrm" Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 66FE03F5B1 for ; Mon, 8 Jan 2024 12:10:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704715811; bh=mADyhqp5Fy5mB38qoO1ZIXMT9rQkzzjtNQqjvzvAMZk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JARV6rrmrwl2dhrMxKwjtxHhcxrvvpFrG9B38kB6ZgU8sFjV0WvPP+N3Z8Qj7x8lP 2RRTd/AJAbC593xYTRenNmvwiXG+KbzjHUyvS9LcMczyqQHKrCLM51zAxWyrYUD50s +irn3t+jwSALdadtoN7qtoJzpfluHp7N2qzVsq23BvqFPYt1aZlGjHAY76cRzeJtsB zI6/pTboBLxHh0dq3ftvLHAuXz4cpxnlOpqPbppDPv+JxaGdME17pOh30y63bGpMT9 O4KGKqp9NNKGeZhqWbHNzbMh5sz+L40kiREgQcGLzuTcsIe3d9Nl6pFZxMxQct/ss9 ENsYu+ndcaTIg== Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2cce9de723cso13931911fa.0 for ; Mon, 08 Jan 2024 04:10:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704715811; x=1705320611; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mADyhqp5Fy5mB38qoO1ZIXMT9rQkzzjtNQqjvzvAMZk=; b=XWUyiSreu/3w8hye2znQcI5hepUgtvHlbKmxOuORHFy2BIX76EUlYB0O1NEqQ9ruuG f0rlrYXBmHoY5+R3loMmzkvNGXzZi6rZjFgMwSG0zSx56dRICW1uf+F7ZfKb58ePAC15 IOkcwrtcOFQGs1v2So366P+VQ0AdyYcRdRZy+dZ7SSmsJuzaB9RRvO0zBpD8aUukFLQe 2kSa3Io31uRliNHp1VXdWvM8hB1caDhL1lwXFkmBhWWhRlGWXvscqdbOg1IVCCRQUVcW wjy09fcGKAoBdgnx7pMvcIp+Nq5hszElrsUYk+mOFh8nLzRvZutLMD2o9zW0dm9+6BNP LdDA== X-Gm-Message-State: AOJu0YxXZG02n67WJTU09DXxp3mg48KiKB/bbCHxjjsWp4+KMYU3isj6 CsxRQefuSCHMttJJgBwqc/VZo7Mrde9DN0zH3Spg+3+np4zRQIVqbedMdRgJyNBmfSie37Qc4Qd LR8YYADz83J3LOuGzZXYn5f8oeeL3+ntNH6yZsqYWAcvcWq+W X-Received: by 2002:a2e:b384:0:b0:2cd:57ba:b4f2 with SMTP id f4-20020a2eb384000000b002cd57bab4f2mr489983lje.79.1704715810863; Mon, 08 Jan 2024 04:10:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IGXiihwIK3jmo6piZR/rMi5zufkqOFkZO264KCNFzXCABUwA04B3BKVjQVddj/nKgCIB6bAsg== X-Received: by 2002:a2e:b384:0:b0:2cd:57ba:b4f2 with SMTP id f4-20020a2eb384000000b002cd57bab4f2mr489976lje.79.1704715810668; Mon, 08 Jan 2024 04:10:10 -0800 (PST) Received: from localhost.localdomain ([91.64.72.41]) by smtp.gmail.com with ESMTPSA id fi21-20020a056402551500b005578b816f20sm1767959edb.29.2024.01.08.04.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 04:10:09 -0800 (PST) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, stgraber@stgraber.org, linux-fsdevel@vger.kernel.org, Seth Forshee , Miklos Szeredi , Amir Goldstein , Bernd Schubert , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v1 4/9] fs/fuse: support idmapped getattr inode op Date: Mon, 8 Jan 2024 13:08:19 +0100 Message-Id: <20240108120824.122178-5-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> References: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We have to: - pass an idmapping to the generic_fillattr() to properly handle UIG/GID mapping for the userspace. - pass -/- to fuse_fillattr() (analog of generic_fillattr() in fuse). Difference between these two is that generic_fillattr() takes all the stat() data from the inode directly, while fuse_fillattr() codepath takes a fresh data just from the userspace reply on the FUSE_GETATTR reques= t. Cc: Christian Brauner Cc: Seth Forshee Cc: Miklos Szeredi Cc: Amir Goldstein Cc: Bernd Schubert Cc: Signed-off-by: Alexander Mikhalitsyn --- fs/fuse/dir.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index a0968f086b62..5efcf06622f0 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1149,18 +1149,22 @@ static int fuse_link(struct dentry *entry, struct i= node *newdir, return err; } =20 -static void fuse_fillattr(struct inode *inode, struct fuse_attr *attr, - struct kstat *stat) +static void fuse_fillattr(struct mnt_idmap *idmap, struct inode *inode, + struct fuse_attr *attr, struct kstat *stat) { unsigned int blkbits; struct fuse_conn *fc =3D get_fuse_conn(inode); + vfsuid_t vfsuid =3D make_vfsuid(idmap, fc->user_ns, + make_kuid(fc->user_ns, attr->uid)); + vfsgid_t vfsgid =3D make_vfsgid(idmap, fc->user_ns, + make_kgid(fc->user_ns, attr->gid)); =20 stat->dev =3D inode->i_sb->s_dev; stat->ino =3D attr->ino; stat->mode =3D (inode->i_mode & S_IFMT) | (attr->mode & 07777); stat->nlink =3D attr->nlink; - stat->uid =3D make_kuid(fc->user_ns, attr->uid); - stat->gid =3D make_kgid(fc->user_ns, attr->gid); + stat->uid =3D vfsuid_into_kuid(vfsuid); + stat->gid =3D vfsgid_into_kgid(vfsgid); stat->rdev =3D inode->i_rdev; stat->atime.tv_sec =3D attr->atime; stat->atime.tv_nsec =3D attr->atimensec; @@ -1199,8 +1203,8 @@ static void fuse_statx_to_attr(struct fuse_statx *sx,= struct fuse_attr *attr) attr->blksize =3D sx->blksize; } =20 -static int fuse_do_statx(struct inode *inode, struct file *file, - struct kstat *stat) +static int fuse_do_statx(struct mnt_idmap *idmap, struct inode *inode, + struct file *file, struct kstat *stat) { int err; struct fuse_attr attr; @@ -1253,15 +1257,15 @@ static int fuse_do_statx(struct inode *inode, struc= t file *file, stat->result_mask =3D sx->mask & (STATX_BASIC_STATS | STATX_BTIME); stat->btime.tv_sec =3D sx->btime.tv_sec; stat->btime.tv_nsec =3D min_t(u32, sx->btime.tv_nsec, NSEC_PER_SEC - 1); - fuse_fillattr(inode, &attr, stat); + fuse_fillattr(idmap, inode, &attr, stat); stat->result_mask |=3D STATX_TYPE; } =20 return 0; } =20 -static int fuse_do_getattr(struct inode *inode, struct kstat *stat, - struct file *file) +static int fuse_do_getattr(struct mnt_idmap *idmap, struct inode *inode, + struct kstat *stat, struct file *file) { int err; struct fuse_getattr_in inarg; @@ -1300,15 +1304,15 @@ static int fuse_do_getattr(struct inode *inode, str= uct kstat *stat, ATTR_TIMEOUT(&outarg), attr_version); if (stat) - fuse_fillattr(inode, &outarg.attr, stat); + fuse_fillattr(idmap, inode, &outarg.attr, stat); } } return err; } =20 -static int fuse_update_get_attr(struct inode *inode, struct file *file, - struct kstat *stat, u32 request_mask, - unsigned int flags) +static int fuse_update_get_attr(struct mnt_idmap *idmap, struct inode *ino= de, + struct file *file, struct kstat *stat, + u32 request_mask, unsigned int flags) { struct fuse_inode *fi =3D get_fuse_inode(inode); struct fuse_conn *fc =3D get_fuse_conn(inode); @@ -1339,16 +1343,16 @@ static int fuse_update_get_attr(struct inode *inode= , struct file *file, forget_all_cached_acls(inode); /* Try statx if BTIME is requested */ if (!fc->no_statx && (request_mask & ~STATX_BASIC_STATS)) { - err =3D fuse_do_statx(inode, file, stat); + err =3D fuse_do_statx(idmap, inode, file, stat); if (err =3D=3D -ENOSYS) { fc->no_statx =3D 1; goto retry; } } else { - err =3D fuse_do_getattr(inode, stat, file); + err =3D fuse_do_getattr(idmap, inode, stat, file); } } else if (stat) { - generic_fillattr(&nop_mnt_idmap, request_mask, inode, stat); + generic_fillattr(idmap, request_mask, inode, stat); stat->mode =3D fi->orig_i_mode; stat->ino =3D fi->orig_ino; if (test_bit(FUSE_I_BTIME, &fi->state)) { @@ -1362,7 +1366,7 @@ static int fuse_update_get_attr(struct inode *inode, = struct file *file, =20 int fuse_update_attributes(struct inode *inode, struct file *file, u32 mas= k) { - return fuse_update_get_attr(inode, file, NULL, mask, 0); + return fuse_update_get_attr(&nop_mnt_idmap, inode, file, NULL, mask, 0); } =20 int fuse_reverse_inval_entry(struct fuse_conn *fc, u64 parent_nodeid, @@ -1506,7 +1510,7 @@ static int fuse_perm_getattr(struct inode *inode, int= mask) return -ECHILD; =20 forget_all_cached_acls(inode); - return fuse_do_getattr(inode, NULL, NULL); + return fuse_do_getattr(&nop_mnt_idmap, inode, NULL, NULL); } =20 /* @@ -2062,7 +2066,7 @@ static int fuse_setattr(struct mnt_idmap *idmap, stru= ct dentry *entry, * ia_mode calculation may have used stale i_mode. * Refresh and recalculate. */ - ret =3D fuse_do_getattr(inode, NULL, file); + ret =3D fuse_do_getattr(&nop_mnt_idmap, inode, NULL, file); if (ret) return ret; =20 @@ -2119,7 +2123,7 @@ static int fuse_getattr(struct mnt_idmap *idmap, return -EACCES; } =20 - return fuse_update_get_attr(inode, NULL, stat, request_mask, flags); + return fuse_update_get_attr(idmap, inode, NULL, stat, request_mask, flags= ); } =20 static const struct inode_operations fuse_dir_inode_operations =3D { --=20 2.34.1 From nobody Fri Dec 26 09:37:21 2025 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E564041208 for ; Mon, 8 Jan 2024 12:10:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="JtN9iQVC" Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 20C403F744 for ; Mon, 8 Jan 2024 12:10:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704715814; bh=aN55u2dkdKkT9zGjEjP2EnVAXA2m3PLWvFfoTZsXkV4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JtN9iQVC11J1SchqzCJSRAg67r4S5UDZyehwGkKERF25+8lAosFuE4pCdCR68SB8g MphGgwr75jSZnX/s1MOP7bth5iHDAe4utxzy6DV+IRP0sG+Jz/3KkyTRDTpND605Lo 4267d/R91yMcgAy8x2myT4H+wGqVTJQUjrCLMep+yhAtJTuTHCgF7BG4aC3aKyP4TE WL1V3HacZaHShDyeE8V3kmpas1YukBQxfNwjoNpQDQ/FMAv1FHGEZ5MAa0Mk+5SATp 2DKmUXnVcVzUmZf3sPGuyWCjlBE1HoSlXHQFPV4IaSUfiQkSdBMfVj2R2yF/9XSQNr ANkiBvT+2Wrxg== Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-557a615aa33so442988a12.2 for ; Mon, 08 Jan 2024 04:10:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704715813; x=1705320613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aN55u2dkdKkT9zGjEjP2EnVAXA2m3PLWvFfoTZsXkV4=; b=okD9W1+FngElW/EgZcXTLWfTfDHgR/V0uTt/bK7+NypOe9XWSdt1LrhKNCJCXSN3ic iKQLHqp0zAFBTBQgacNmUQG7nBDc+5XS43y4FbR/+vdOZK4HmGaQ2dCMrRZ2wUwPoMSg F+HuI21L3wDIGVgOuVUpy1Ml8ggl9AbL7fYJGVbzsfMC5nqY+SJgznns6IvgHKNuffro oqF+0gGC2PnYPxaTEEB8/c2VnFubbPk3MwtqdVBlXrduC/6ST70664Q0rr3+GsHUmy4/ G5jqOj1IiX8KXxccRAlmZ72iSuGn5RsYNyoXzPc6sXtJu81N4FRLvZxnLPRx1U5htAFE QAFw== X-Gm-Message-State: AOJu0YyRfJPoSBSjhVKZPWUUACFmUKvjJc0AcP8aOHx9Q9g30T3pDRp1 95qiLbr9D16JGTAIokOdDBonjy26HMnqbkAVhresMV/od5ZO8XX3ph9eQwChI/d7iaZKyk8mtJt LrcpDBluVY7UZ5oUYx22iHddmG2jYfrR6hX+1wy6eKPFHX9q5 X-Received: by 2002:a50:8ac4:0:b0:553:a041:3560 with SMTP id k4-20020a508ac4000000b00553a0413560mr2378959edk.58.1704715813678; Mon, 08 Jan 2024 04:10:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IGJP5eOOFi4zff3/kz6KkKpi/0hmrVe9vDrjDdCDnW47eqq7qvcAY6eriI0cBf+y7RTehsDkQ== X-Received: by 2002:a50:8ac4:0:b0:553:a041:3560 with SMTP id k4-20020a508ac4000000b00553a0413560mr2378953edk.58.1704715813387; Mon, 08 Jan 2024 04:10:13 -0800 (PST) Received: from localhost.localdomain ([91.64.72.41]) by smtp.gmail.com with ESMTPSA id fi21-20020a056402551500b005578b816f20sm1767959edb.29.2024.01.08.04.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 04:10:12 -0800 (PST) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, stgraber@stgraber.org, linux-fsdevel@vger.kernel.org, Seth Forshee , Miklos Szeredi , Amir Goldstein , Bernd Schubert , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v1 5/9] fs/fuse: support idmapped ->permission inode op Date: Mon, 8 Jan 2024 13:08:20 +0100 Message-Id: <20240108120824.122178-6-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> References: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We only cover the case when "default_permissions" flag is used. A reason for that is that otherwise all the permission checks are done in the userspace and we have to deal with VFS idmapping in the userspace (which is bad), alternatively we have to provide the userspace with idmapped req->in.h.uid/req->in.h.gid which is also not align with VFS idmaps philosophy. Cc: Christian Brauner Cc: Seth Forshee Cc: Miklos Szeredi Cc: Amir Goldstein Cc: Bernd Schubert Cc: Signed-off-by: Alexander Mikhalitsyn --- fs/fuse/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 5efcf06622f0..f7c2c54f7122 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1558,7 +1558,7 @@ static int fuse_permission(struct mnt_idmap *idmap, } =20 if (fc->default_permissions) { - err =3D generic_permission(&nop_mnt_idmap, inode, mask); + err =3D generic_permission(idmap, inode, mask); =20 /* If permission is denied, try to refresh file attributes. This is also needed, because the root @@ -1566,7 +1566,7 @@ static int fuse_permission(struct mnt_idmap *idmap, if (err =3D=3D -EACCES && !refreshed) { err =3D fuse_perm_getattr(inode, mask); if (!err) - err =3D generic_permission(&nop_mnt_idmap, + err =3D generic_permission(idmap, inode, mask); } =20 --=20 2.34.1 From nobody Fri Dec 26 09:37:21 2025 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E48041230 for ; Mon, 8 Jan 2024 12:10:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="O3ONM7m+" Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id AE6103F2A6 for ; Mon, 8 Jan 2024 12:10:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704715816; bh=9JOCkZnahtYcjH5f/6OzDGT6n3cRWHJ6WXIUPPzUvyw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=O3ONM7m+eFjSrc/qCOGyOSDoP9mzxvpW4mg13LZQzt8raSR+yZG6qNs2lC2pPNcMk dadoWRzbK4UGfN4gTf9E/0DaukJwudqo02FI8BWvdETQ7OGtHkavTqX4rxGD6rLRwL vPRhArHbHXFnX0RwZwebAV0XbY+T2Pg8efOatTJOygVazKdVjOQjSjI4irgxSb1IAW bROfPJFdaQp6nYlT7AMvpxq7eHAhyXgM7XR1xaoCW7aL0qlkAiaE/6NMCKkbRwRigj E9HA/A/dwFNroT5HcsaAYlRfbUQDJIBDKFceJ92Yc0DCCaxvRywXEPX0ijlebi3pio Ad1Mp63ezzmcg== Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-557a318580dso536676a12.3 for ; Mon, 08 Jan 2024 04:10:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704715816; x=1705320616; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9JOCkZnahtYcjH5f/6OzDGT6n3cRWHJ6WXIUPPzUvyw=; b=npC7rYn/zFlLe6mShrE7DBV0iVpqKDRs0bpSqyDkoHu+v05x8RLo/QLx4+8useZGYO JG3fyR2lFyxMLZSS1TaHHTnEGJ1YbMtcwfiwVgZqkEqyUAfRHs+o5RnWXfSAdjHPt12i 2Uc2u+YpoKzZhAhYcEH10+FSoJowzBsxcU8jMXIPQtVt37R38K9LbCv0P3JSZHUK8l64 ggrCHe6lI5mT8OCT5BMdmsgLUWIBjq+jh/iDQFXmGrCnRB/REIpYcR7cHWdOZHDXTrfL N7JerO90tr6Cyb9OdNnLnVhLd2twqsNaoDUyjMX87hra+KpO5CW8qLks/Mx1Q7MIy2HK jOjQ== X-Gm-Message-State: AOJu0YxtdU08/HJCPrkopjpdALb4wtJu2ir3W0imvN6gSVRtYfkygC+1 tCok8u10PktTnaRMMQIAeP7/PwVBH6g7pkw+BtYx6e0EKkwAzyAt3DDZKpFt1qPkpL+zfFDzw3C bmw9Y7ite0hELOsGn9t9+lhws/a5GuFIFzlMGw0gCd0eOZiYL X-Received: by 2002:a50:9e24:0:b0:557:2213:bc4e with SMTP id z33-20020a509e24000000b005572213bc4emr1414494ede.57.1704715816369; Mon, 08 Jan 2024 04:10:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IHw8peZwjRNS6HnIeq6gf9kiSM/PadeOHzJBqN/8B3lBmvGk2+H+2sR5ks64RD0Cx44QtvI+w== X-Received: by 2002:a50:9e24:0:b0:557:2213:bc4e with SMTP id z33-20020a509e24000000b005572213bc4emr1414490ede.57.1704715816191; Mon, 08 Jan 2024 04:10:16 -0800 (PST) Received: from localhost.localdomain ([91.64.72.41]) by smtp.gmail.com with ESMTPSA id fi21-20020a056402551500b005578b816f20sm1767959edb.29.2024.01.08.04.10.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 04:10:14 -0800 (PST) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, stgraber@stgraber.org, linux-fsdevel@vger.kernel.org, Seth Forshee , Miklos Szeredi , Amir Goldstein , Bernd Schubert , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v1 6/9] fs/fuse: support idmapped ->setattr op Date: Mon, 8 Jan 2024 13:08:21 +0100 Message-Id: <20240108120824.122178-7-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> References: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Cc: Christian Brauner Cc: Seth Forshee Cc: Miklos Szeredi Cc: Amir Goldstein Cc: Bernd Schubert Cc: Signed-off-by: Alexander Mikhalitsyn --- fs/fuse/dir.c | 32 +++++++++++++++++++++----------- fs/fuse/file.c | 2 +- fs/fuse/fuse_i.h | 4 ++-- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index f7c2c54f7122..5fbb7100ad1c 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1739,17 +1739,27 @@ static bool update_mtime(unsigned ivalid, bool trus= t_local_mtime) return true; } =20 -static void iattr_to_fattr(struct fuse_conn *fc, struct iattr *iattr, - struct fuse_setattr_in *arg, bool trust_local_cmtime) +static void iattr_to_fattr(struct mnt_idmap *idmap, struct fuse_conn *fc, + struct iattr *iattr, struct fuse_setattr_in *arg, + bool trust_local_cmtime) { unsigned ivalid =3D iattr->ia_valid; =20 if (ivalid & ATTR_MODE) arg->valid |=3D FATTR_MODE, arg->mode =3D iattr->ia_mode; - if (ivalid & ATTR_UID) - arg->valid |=3D FATTR_UID, arg->uid =3D from_kuid(fc->user_ns, iattr-= >ia_uid); - if (ivalid & ATTR_GID) - arg->valid |=3D FATTR_GID, arg->gid =3D from_kgid(fc->user_ns, iattr-= >ia_gid); + + if (ivalid & ATTR_UID) { + kuid_t fsuid =3D from_vfsuid(idmap, fc->user_ns, iattr->ia_vfsuid); + arg->valid |=3D FATTR_UID; + arg->uid =3D from_kuid(fc->user_ns, fsuid); + } + + if (ivalid & ATTR_GID) { + kgid_t fsgid =3D from_vfsgid(idmap, fc->user_ns, iattr->ia_vfsgid); + arg->valid |=3D FATTR_GID; + arg->gid =3D from_kgid(fc->user_ns, fsgid); + } + if (ivalid & ATTR_SIZE) arg->valid |=3D FATTR_SIZE, arg->size =3D iattr->ia_size; if (ivalid & ATTR_ATIME) { @@ -1869,8 +1879,8 @@ int fuse_flush_times(struct inode *inode, struct fuse= _file *ff) * vmtruncate() doesn't allow for this case, so do the rlimit checking * and the actual truncation by hand. */ -int fuse_do_setattr(struct dentry *dentry, struct iattr *attr, - struct file *file) +int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry, + struct iattr *attr, struct file *file) { struct inode *inode =3D d_inode(dentry); struct fuse_mount *fm =3D get_fuse_mount(inode); @@ -1890,7 +1900,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iat= tr *attr, if (!fc->default_permissions) attr->ia_valid |=3D ATTR_FORCE; =20 - err =3D setattr_prepare(&nop_mnt_idmap, dentry, attr); + err =3D setattr_prepare(idmap, dentry, attr); if (err) return err; =20 @@ -1949,7 +1959,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iat= tr *attr, =20 memset(&inarg, 0, sizeof(inarg)); memset(&outarg, 0, sizeof(outarg)); - iattr_to_fattr(fc, attr, &inarg, trust_local_cmtime); + iattr_to_fattr(idmap, fc, attr, &inarg, trust_local_cmtime); if (file) { struct fuse_file *ff =3D file->private_data; inarg.valid |=3D FATTR_FH; @@ -2084,7 +2094,7 @@ static int fuse_setattr(struct mnt_idmap *idmap, stru= ct dentry *entry, if (!attr->ia_valid) return 0; =20 - ret =3D fuse_do_setattr(entry, attr, file); + ret =3D fuse_do_setattr(idmap, entry, attr, file); if (!ret) { /* * If filesystem supports acls it may have updated acl xattrs in diff --git a/fs/fuse/file.c b/fs/fuse/file.c index a660f1f21540..e0fe5497a548 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -2870,7 +2870,7 @@ static void fuse_do_truncate(struct file *file) attr.ia_file =3D file; attr.ia_valid |=3D ATTR_FILE; =20 - fuse_do_setattr(file_dentry(file), &attr, file); + fuse_do_setattr(&nop_mnt_idmap, file_dentry(file), &attr, file); } =20 static inline loff_t fuse_round_up(struct fuse_conn *fc, loff_t off) diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 15ec95dea276..94b25ea5344a 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -1288,8 +1288,8 @@ bool fuse_write_update_attr(struct inode *inode, loff= _t pos, ssize_t written); int fuse_flush_times(struct inode *inode, struct fuse_file *ff); int fuse_write_inode(struct inode *inode, struct writeback_control *wbc); =20 -int fuse_do_setattr(struct dentry *dentry, struct iattr *attr, - struct file *file); +int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry, + struct iattr *attr, struct file *file); =20 void fuse_set_initialized(struct fuse_conn *fc); =20 --=20 2.34.1 From nobody Fri Dec 26 09:37:21 2025 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DBE042044 for ; Mon, 8 Jan 2024 12:10:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="oZgET+09" Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id B14F83F5A7 for ; Mon, 8 Jan 2024 12:10:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704715819; bh=AZ1e4DQplobEkYb2oelZJP/g6uMuj6ixR2NKn4USgqo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oZgET+09Ka8MNP9uDRDSiEXoBiVx6GYwnMHXNDL4GQCvAdtU6ymuhi9QMZobpNiLI y1ek8B3KBeTZsMv6+8Ks72uRfZCg4wtlJezxSwDVrM35BRcg/jtf+xCloGAJzR6X6z +6xcfcmko6NoOhs4lLGqR7TiSKPxzySaPUpzAERXy+22ef1l8OFK0/3UEYGggcRehO E0GDqXmEwpqBocf/8ihFCUoiA62p2Tp90+5IJhkIe4hBNWne+pXHJ0izdMAIIb8i0z OLoVaSAU5ObfDlMaLWu+Zg/BwHqwa9SXQVv2JJTIARsfe5hKzFDxWRceft2BaXmE0K kuDSLTFwAhlig== Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-50e69fc4574so1186636e87.3 for ; Mon, 08 Jan 2024 04:10:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704715819; x=1705320619; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AZ1e4DQplobEkYb2oelZJP/g6uMuj6ixR2NKn4USgqo=; b=Fj8acP8ib5UaP0sP7BgP0+I+uqGmHp9CYtmB2TnGbp8W8cgbGpZpvdTU1Rfo7rcJX3 E/Wpzl5VhLftfoL+eGicPVNwC0xb99j2TgG9yAie+3zgRLMJ+4qgt7Z8hHv7681taoVl aY/4CzicZT8G9drPjRLRJFa0RAAc4avLZelMsp9mf9eduUuftihAIGNw01wA0I36sDmD Pwm7+p9KcBCrAO5pkngdVEf6tyr0OB/Nkq23UdOlW4LnZ4DD7RemlQkg3PDybxHNov6G TTIfVKvV+jb8qfkpuev57PVkczDi7E7yFiRCrrhfUPyTkBOkFTJ5+DL6/f2JOt76eW2h MNRg== X-Gm-Message-State: AOJu0YwZLp9Bd+TocWeie+ow7o+/azBzZkEnL8JKnmZACAou+BiP+SZw mX+VuWB565vp2PDffRDyyUDDU33l8MRfC7kycN6K/PXqKZbG5RcZwLnudXFhu9513aOyPksFuCv hHZ41vgkhkauzRxYEtflLmfvBXw8cCj1Y1WwLoiNwcVaOwkeE X-Received: by 2002:ac2:44a8:0:b0:50e:7c6e:b411 with SMTP id c8-20020ac244a8000000b0050e7c6eb411mr1194731lfm.103.1704715819058; Mon, 08 Jan 2024 04:10:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IG7Nzn++Vuip8dKLKr2jYqNsa9FafczX9ul7wwW/1w2B0tbqsqXsHCty5yPcFNCQXD2vOYw2Q== X-Received: by 2002:ac2:44a8:0:b0:50e:7c6e:b411 with SMTP id c8-20020ac244a8000000b0050e7c6eb411mr1194719lfm.103.1704715818859; Mon, 08 Jan 2024 04:10:18 -0800 (PST) Received: from localhost.localdomain ([91.64.72.41]) by smtp.gmail.com with ESMTPSA id fi21-20020a056402551500b005578b816f20sm1767959edb.29.2024.01.08.04.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 04:10:17 -0800 (PST) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, stgraber@stgraber.org, linux-fsdevel@vger.kernel.org, Seth Forshee , Miklos Szeredi , Amir Goldstein , Bernd Schubert , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v1 7/9] fs/fuse: drop idmap argument from __fuse_get_acl Date: Mon, 8 Jan 2024 13:08:22 +0100 Message-Id: <20240108120824.122178-8-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> References: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We don't need to have idmap in the __fuse_get_acl as we don't have any use for it. In the current POSIX ACL implementation, idmapped mounts are taken into account on the userspace/kernel border (see vfs_set_acl_idmapped_mnt() and vfs_posix_acl_to_xattr()). Cc: Christian Brauner Cc: Seth Forshee Cc: Miklos Szeredi Cc: Amir Goldstein Cc: Bernd Schubert Cc: Signed-off-by: Alexander Mikhalitsyn Reviewed-by: Christian Brauner --- fs/fuse/acl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/fuse/acl.c b/fs/fuse/acl.c index 3d192b80a561..3a3cd88bd3d7 100644 --- a/fs/fuse/acl.c +++ b/fs/fuse/acl.c @@ -12,7 +12,6 @@ #include =20 static struct posix_acl *__fuse_get_acl(struct fuse_conn *fc, - struct mnt_idmap *idmap, struct inode *inode, int type, bool rcu) { int size; @@ -74,7 +73,7 @@ struct posix_acl *fuse_get_acl(struct mnt_idmap *idmap, if (fuse_no_acl(fc, inode)) return ERR_PTR(-EOPNOTSUPP); =20 - return __fuse_get_acl(fc, idmap, inode, type, false); + return __fuse_get_acl(fc, inode, type, false); } =20 struct posix_acl *fuse_get_inode_acl(struct inode *inode, int type, bool r= cu) @@ -90,8 +89,7 @@ struct posix_acl *fuse_get_inode_acl(struct inode *inode,= int type, bool rcu) */ if (!fc->posix_acl) return NULL; - - return __fuse_get_acl(fc, &nop_mnt_idmap, inode, type, rcu); + return __fuse_get_acl(fc, inode, type, rcu); } =20 int fuse_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, --=20 2.34.1 From nobody Fri Dec 26 09:37:21 2025 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EC8A43168 for ; Mon, 8 Jan 2024 12:10:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="QBWWjpI/" Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 1D0A03F582 for ; Mon, 8 Jan 2024 12:10:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704715822; bh=9iWRZnNscxr8QayhU5Rg4d2f++I0rJo2nyXgNTtGjkw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QBWWjpI/vwNsW4e0Nrk+uB+Vy7BEF1BBYekr4ch8hpXdEf+tBI07ypHOWmvEAzQFV IxXgt+zcqBqp8YMqFIfBwRCh/2Vc0cB54tG0TY70Nat//xp0TxMfm5gybFOG8YFZTk IIOukF4nmxFKpxiwaznrPJIoRIJZ5hn3pFkEwP4oXNGfoesPvA/qKAeBO87vjpn2qw X+msdpS3rjQN0DWCEcDcnxlpHZAI0vsrNt6WduTr1cH2qFPjbafNeeg9r4rGxxK+3q lp/cVpCo0Y7d6Gd6UnzSB0K3XG3v8kgLNO4BUbrqD70EeMYcUgUPyoqRNqVlm5H7NA NPD/sISFG9lYg== Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5551f8ec1c8so1104868a12.1 for ; Mon, 08 Jan 2024 04:10:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704715821; x=1705320621; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9iWRZnNscxr8QayhU5Rg4d2f++I0rJo2nyXgNTtGjkw=; b=o+bSkU02q6HE4/Wijf8X8BQ0yZXy3KnBMDmryuMdTQshjwYW52pNPLILo8CqbvNb5H 1zw8mZZLrCX0dnoftervP9goF44Ys5Tgmp1srslNJ9G41HwuUomgP14SLCdE13M67yWn rAM9pUb562+9uawHG80OT20d+Ox3PTVh67crp4PSbzBo1YBnV+3sUX0TUTWsOwM9ApD6 2EyxNDC8QN59mYwAIwFjWbvEcdvky9idAYtUoY0qw70m3lnguA+8KGNY1BxXMpFb8bXC IDr1FexfW+Cwo3vP1ww2EJhtBok9pw8hTrZx7TDlrTGuTsX7pTucH6UmuzJ+keJk869J tnnQ== X-Gm-Message-State: AOJu0Yx9GiQTQUKC+XUTDmoT0jvGXzqOMSW9wQicif+KfsnsX9kJJYmQ T4p6yJywPAXCawH9o4oFyRNVQKtFKcSdpSrR/ZFKpG+botF9h33NpeBu1MvvmaLtlhsVSGBRWyG cBqXv/kfomrxl1sEbNxFlpPf3SAWtBd3rEOgUxYUoBp5q2lnY X-Received: by 2002:a50:f688:0:b0:557:8d37:2e8d with SMTP id d8-20020a50f688000000b005578d372e8dmr1279929edn.15.1704715821268; Mon, 08 Jan 2024 04:10:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkOLg4PdqdFQ702pfHBj3dKeidAQf6BOtGBbpwTprd9QoY0lj1ZgOD0aGwJAUpLDd3U2Afjw== X-Received: by 2002:a50:f688:0:b0:557:8d37:2e8d with SMTP id d8-20020a50f688000000b005578d372e8dmr1279918edn.15.1704715821105; Mon, 08 Jan 2024 04:10:21 -0800 (PST) Received: from localhost.localdomain ([91.64.72.41]) by smtp.gmail.com with ESMTPSA id fi21-20020a056402551500b005578b816f20sm1767959edb.29.2024.01.08.04.10.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 04:10:20 -0800 (PST) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, stgraber@stgraber.org, linux-fsdevel@vger.kernel.org, Seth Forshee , Miklos Szeredi , Amir Goldstein , Bernd Schubert , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v1 8/9] fs/fuse: support idmapped ->set_acl Date: Mon, 8 Jan 2024 13:08:23 +0100 Message-Id: <20240108120824.122178-9-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> References: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It's just a matter of adjusting a permission check condition for S_ISGID flag. All the rest is already handled in the generic VFS code. Notice that this permission check is the analog of what we have in posix_acl_update_mode() generic helper, but fuse doesn't use this helper as on the kernel side we don't care about ensuring that POSIX ACL and CHMOD permissions are in sync as it is a responsibility of a userspace daemon to handle that. For the same reason we don't have a calls to posix_acl_chmod(), while most of other filesystem do. Cc: Christian Brauner Cc: Seth Forshee Cc: Miklos Szeredi Cc: Amir Goldstein Cc: Bernd Schubert Cc: Signed-off-by: Alexander Mikhalitsyn --- fs/fuse/acl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/fuse/acl.c b/fs/fuse/acl.c index 3a3cd88bd3d7..727fe50e255e 100644 --- a/fs/fuse/acl.c +++ b/fs/fuse/acl.c @@ -144,8 +144,8 @@ int fuse_set_acl(struct mnt_idmap *idmap, struct dentry= *dentry, * be stripped. */ if (fc->posix_acl && - !vfsgid_in_group_p(i_gid_into_vfsgid(&nop_mnt_idmap, inode)) && - !capable_wrt_inode_uidgid(&nop_mnt_idmap, inode, CAP_FSETID)) + !vfsgid_in_group_p(i_gid_into_vfsgid(idmap, inode)) && + !capable_wrt_inode_uidgid(idmap, inode, CAP_FSETID)) extra_flags |=3D FUSE_SETXATTR_ACL_KILL_SGID; =20 ret =3D fuse_setxattr(inode, name, value, size, 0, extra_flags); --=20 2.34.1 From nobody Fri Dec 26 09:37:21 2025 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7034444374 for ; Mon, 8 Jan 2024 12:10:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="ME1wlTxe" Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id EC3DA3F744 for ; Mon, 8 Jan 2024 12:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704715824; bh=5YU1NX55EkC+kEj5EffEs5H2AwvURtGdQ/HYjkwRM8I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ME1wlTxeCrq7VypFX8QeCIX9CrWDmtHj3rCV7u52LprNG24j5mRPU1v0quLW8Yp6X GIa1SUT3GdEZLo47aA2gHLg/zC/3vUqjWtZQyi5V45qQ7AOayOlIRSbKZ/OytvW34h GK+ScFaONHEUNA5TgQZBZaB/zexMemv8THw/icOkRqS4rJvrZmKPV/fs2+LvFHSw6Y Z3CK69KZQtloqdiNrmipkdd4j03+B9GBFNPeLqTcr5Bdk5CN/HUT0JGJfjwebT1alb ZcLDCuaEvnUCzM/FyLVl9R6IQTtjmGtlpI7GOnVcugOkvVvRP981hYQWMR/DjqPhtt 6mZadzbd03egw== Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-5572a57deb1so968216a12.3 for ; Mon, 08 Jan 2024 04:10:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704715824; x=1705320624; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5YU1NX55EkC+kEj5EffEs5H2AwvURtGdQ/HYjkwRM8I=; b=Xu2Z//rAHGs211CE3lMedN2pa3Wr49kMYPk+GvBWRDp9P8v42VdcjnIwDz3t72/AXY 6ySCj1aPCthpaNHLIoO6rsfYpetE7tH/ei+D8SlY70CZNM1qsI1eBqmoD9PDyONYqUOf cJ+ib3qzhtkrtCj5krC1q9tsosEVTJz8TYvhGX2yIXuPmxsA2Fd8LJt2ws5LZhwVOkYI muO8ptKvSyRalwmbwzovmQqyMFI4JeuQzdVAiHdPB9gE/HHMU6npSiIwUai5seeAY4sc xnR7ryuPdwnL6dQHICKnELaJpd0NQoHPZFHgyFEdjMc5RbUfjwnMRkBuf137unyz2Cb5 BqWA== X-Gm-Message-State: AOJu0Yxcios9YcTmVzzmpCMvY7CieSOqBkKf2686ZQPeIiwaD/tT9tbP 1OUMnJYur1y0P/1CdUSfGgG5cLrx2l/Rmd2s7tNkwjKPG1XNTt8h9zw6ObSlXURnRLduDFlYhBn xBgWp7eRb69StnbG4YbIdAafZVOTaxCJhoMUZqsJF6SvydMcF X-Received: by 2002:a50:951e:0:b0:552:fcca:ee11 with SMTP id u30-20020a50951e000000b00552fccaee11mr1322927eda.74.1704715824424; Mon, 08 Jan 2024 04:10:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IGbkDQ81TrJrfcIXQl9SZ1Mnhsn8K0v5xkp/foSnlY+Kqttn18YIQ5m+/IG2qQHswCxHJux4g== X-Received: by 2002:a50:951e:0:b0:552:fcca:ee11 with SMTP id u30-20020a50951e000000b00552fccaee11mr1322918eda.74.1704715823978; Mon, 08 Jan 2024 04:10:23 -0800 (PST) Received: from localhost.localdomain ([91.64.72.41]) by smtp.gmail.com with ESMTPSA id fi21-20020a056402551500b005578b816f20sm1767959edb.29.2024.01.08.04.10.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 04:10:22 -0800 (PST) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, stgraber@stgraber.org, linux-fsdevel@vger.kernel.org, Seth Forshee , Miklos Szeredi , Amir Goldstein , Bernd Schubert , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v1 9/9] fs/fuse: allow idmapped mounts Date: Mon, 8 Jan 2024 13:08:24 +0100 Message-Id: <20240108120824.122178-10-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> References: <20240108120824.122178-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now we have everything in place and we can allow idmapped mounts by setting the FS_ALLOW_IDMAP flag. Notice that real availability of idmapped mounts will depend on the fuse daemon. Fuse daemon have to set FUSE_ALLOW_IDMAP flag in the FUSE_INIT reply. To discuss: - we enable idmapped mounts support only if "default_permissions" mode is e= nabled, because otherwise we would need to deal with UID/GID mappings in the usersp= ace side OR provide the userspace with idmapped req->in.h.uid/req->in.h.gid values whic= h is not something that we probably want to. Idmapped mounts phylosophy is not about= faking caller uid/gid. - We have a small offlist discussion with Christian around adding fs_type->= allow_idmap hook. Christian pointed that it would be nice to have a superblock flag ins= tead like SB_I_NOIDMAP and we can set this flag during mount time if we see that file= system does not support idmappings. But, unfortunately I didn't succeed here because the ke= rnel will know if the filesystem supports idmapping or not after FUSE_INIT request, b= ut FUSE_INIT request is being sent at the end of mounting process, so mount and superblock will = exist and visible by the userspace in that time. It seems like setting SB_I_NOIDMAP f= lag in this case is too late as user may do the trick with creating a idmapped mount wh= ile it wasn't restricted by SB_I_NOIDMAP. Alternatively, we can introduce a "positive" ve= rsion SB_I_ALLOWIDMAP and "weak" version of FS_ALLOW_IDMAP like FS_MAY_ALLOW_IDMAP. So if FS_MAY_= ALLOW_IDMAP is set, then SB_I_ALLOWIDMAP has to be set on the superblock to allow creation of a= n idmapped mount. But that's a matter of our discussion. Some extra links and examples: - libfuse support https://github.com/mihalicyn/libfuse/commits/idmap_support - fuse-overlayfs support: https://github.com/mihalicyn/fuse-overlayfs/commits/idmap_support - cephfs-fuse conversion example https://github.com/mihalicyn/ceph/commits/fuse_idmap - glusterfs conversion example https://github.com/mihalicyn/glusterfs/commits/fuse_idmap Cc: Christian Brauner Cc: Seth Forshee Cc: Miklos Szeredi Cc: Amir Goldstein Cc: Bernd Schubert Cc: Signed-off-by: Alexander Mikhalitsyn --- fs/fuse/fuse_i.h | 3 +++ fs/fuse/inode.c | 22 +++++++++++++++++++--- include/uapi/linux/fuse.h | 5 ++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 94b25ea5344a..9317b8c35191 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -809,6 +809,9 @@ struct fuse_conn { /* Add owner_{u,g}id info when creating a new inode */ unsigned int owner_uid_gid_ext:1; =20 + /* Allow creation of idmapped mounts */ + unsigned int allow_idmap:1; + /* Does the filesystem support per inode DAX? */ unsigned int inode_dax:1; =20 diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 08cd3714b32d..47e32a8baed3 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1286,6 +1286,12 @@ static void process_init_reply(struct fuse_mount *fm= , struct fuse_args *args, fc->direct_io_allow_mmap =3D 1; if (flags & FUSE_OWNER_UID_GID_EXT) fc->owner_uid_gid_ext =3D 1; + if (flags & FUSE_ALLOW_IDMAP) { + if (fc->owner_uid_gid_ext && fc->default_permissions) + fc->allow_idmap =3D 1; + else + ok =3D false; + } } else { ra_pages =3D fc->max_read / PAGE_SIZE; fc->no_lock =3D 1; @@ -1332,7 +1338,8 @@ void fuse_send_init(struct fuse_mount *fm) FUSE_NO_OPENDIR_SUPPORT | FUSE_EXPLICIT_INVAL_DATA | FUSE_HANDLE_KILLPRIV_V2 | FUSE_SETXATTR_EXT | FUSE_INIT_EXT | FUSE_SECURITY_CTX | FUSE_CREATE_SUPP_GROUP | - FUSE_HAS_EXPIRE_ONLY | FUSE_DIRECT_IO_ALLOW_MMAP | FUSE_OWNER_UID_GID_EX= T; + FUSE_HAS_EXPIRE_ONLY | FUSE_DIRECT_IO_ALLOW_MMAP | + FUSE_OWNER_UID_GID_EXT | FUSE_ALLOW_IDMAP; #ifdef CONFIG_FUSE_DAX if (fm->fc->dax) flags |=3D FUSE_MAP_ALIGNMENT; @@ -1915,12 +1922,20 @@ static void fuse_kill_sb_anon(struct super_block *s= b) fuse_mount_destroy(get_fuse_mount_super(sb)); } =20 +static bool fuse_allow_idmap(struct super_block *sb) +{ + struct fuse_conn *fc =3D get_fuse_conn_super(sb); + + return fc->allow_idmap; +} + static struct file_system_type fuse_fs_type =3D { .owner =3D THIS_MODULE, .name =3D "fuse", - .fs_flags =3D FS_HAS_SUBTYPE | FS_USERNS_MOUNT, + .fs_flags =3D FS_HAS_SUBTYPE | FS_USERNS_MOUNT | FS_ALLOW_IDMAP, .init_fs_context =3D fuse_init_fs_context, .parameters =3D fuse_fs_parameters, + .allow_idmap =3D fuse_allow_idmap, .kill_sb =3D fuse_kill_sb_anon, }; MODULE_ALIAS_FS("fuse"); @@ -1938,8 +1953,9 @@ static struct file_system_type fuseblk_fs_type =3D { .name =3D "fuseblk", .init_fs_context =3D fuse_init_fs_context, .parameters =3D fuse_fs_parameters, + .allow_idmap =3D fuse_allow_idmap, .kill_sb =3D fuse_kill_sb_blk, - .fs_flags =3D FS_REQUIRES_DEV | FS_HAS_SUBTYPE, + .fs_flags =3D FS_REQUIRES_DEV | FS_HAS_SUBTYPE | FS_ALLOW_IDMAP, }; MODULE_ALIAS_FS("fuseblk"); =20 diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index ebe82104b172..d8e1235d9796 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -215,6 +215,7 @@ * 7.40 * - add FUSE_EXT_OWNER_UID_GID * - add FUSE_OWNER_UID_GID_EXT + * - add FUSE_ALLOW_IDMAP */ =20 #ifndef _LINUX_FUSE_H @@ -250,7 +251,7 @@ #define FUSE_KERNEL_VERSION 7 =20 /** Minor version number of this interface */ -#define FUSE_KERNEL_MINOR_VERSION 39 +#define FUSE_KERNEL_MINOR_VERSION 40 =20 /** The node ID of the root inode */ #define FUSE_ROOT_ID 1 @@ -416,6 +417,7 @@ struct fuse_file_lock { * FUSE_DIRECT_IO_ALLOW_MMAP: allow shared mmap in FOPEN_DIRECT_IO mode. * FUSE_OWNER_UID_GID_EXT: add inode owner UID/GID info to create, mkdir, * symlink and mknod + * FUSE_ALLOW_IDMAP: allow creation of idmapped mounts */ #define FUSE_ASYNC_READ (1 << 0) #define FUSE_POSIX_LOCKS (1 << 1) @@ -459,6 +461,7 @@ struct fuse_file_lock { /* Obsolete alias for FUSE_DIRECT_IO_ALLOW_MMAP */ #define FUSE_DIRECT_IO_RELAX FUSE_DIRECT_IO_ALLOW_MMAP #define FUSE_OWNER_UID_GID_EXT (1ULL << 37) +#define FUSE_ALLOW_IDMAP (1ULL << 38) =20 /** * CUSE INIT request/reply flags --=20 2.34.1