From patchwork Wed Jan 29 23:19:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13954228 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4E49142A92 for ; Wed, 29 Jan 2025 23:20:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738192840; cv=none; b=QnIo/WOJgois4HpIMP2lPapM52KVql0FekvpgTor2dp2+GZu4S6q51pqyKtGfGJYJMGT7bbYSo5tqOSK2My5MX4sr5d80ZuKS3FmasBXKAQTQo+nuAndMlszPmO3ieddQMJNgECbwcFcBtvwVLv+pOPxM+bGjWIQnTMbLpYMKn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738192840; c=relaxed/simple; bh=wTsrhUjhnpw3/U1pdxkhcu+UK+qHYqsWxnahJ8LlV+8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gyZ4Z7govv1emP+ac6Qz4zqIq7kRGtADyuKYBuiU8jrXE2mg+no7I3L9ou//sV8KBnb64zSdAzr9uMQTmf0gl/t7JqkrQHnZM/u2OgIdnFefbpZHYhpgCJzlOeJG/Xkrb3CbOSo1IAMhbLIbkl8hGkbQk2uCaTJC9839mCEAryc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PalrjD8F; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PalrjD8F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20251C4CEE0; Wed, 29 Jan 2025 23:20:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738192839; bh=wTsrhUjhnpw3/U1pdxkhcu+UK+qHYqsWxnahJ8LlV+8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PalrjD8FVkA4xgtje1X7gPeghL0t25N8vOxTmvgGylzMhQogWtRlaQ26BTHGcJ82N jM9PJwAvcJMZhSXtAVGqS/fU+Sx8OV/Pg5HA5borgDg2vT44GIhlN9zqawv79g2QFU CA4HoeVYvBk2y2bYoJD4Ype3ZylPhFS93tOkLq5zMaw+bcJEVTvf8FiZSBl2kCynVM w/Ir9KKY1bF78OZ9Np6efaoVICa1QfcUgJnV7KA6EPKJDwEQ5CP+E5GC80xrveFeIY BE6e1DzZzcyCMthxu0+17iEIizmLrgQTPzUHsgWVe0mFqgUqflUgQlvyRaiNfgByov AF4GhWIpj1xnQ== From: Christian Brauner Date: Thu, 30 Jan 2025 00:19:51 +0100 Subject: [PATCH 1/4] uidgid: add map_id_range_up() Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250130-work-mnt_idmap-statmount-v1-1-d4ced5874e14@kernel.org> References: <20250130-work-mnt_idmap-statmount-v1-0-d4ced5874e14@kernel.org> In-Reply-To: <20250130-work-mnt_idmap-statmount-v1-0-d4ced5874e14@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: Josef Bacik , Jeff Layton , Lennart Poettering , Daan De Meyer , Seth Forshee , Miklos Szeredi , Christian Brauner X-Mailer: b4 0.15-dev-d23a9 X-Developer-Signature: v=1; a=openpgp-sha256; l=3667; i=brauner@kernel.org; h=from:subject:message-id; bh=wTsrhUjhnpw3/U1pdxkhcu+UK+qHYqsWxnahJ8LlV+8=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaTP2n5YV8R+jWWweNb3R3/dpbdGORZv3bE0QOliy8KkJ gfdfR4GHaUsDGJcDLJiiiwO7Sbhcst5KjYbZWrAzGFlAhnCwMUpABPhfMHwVyr5fKeR15tIdQ/G 9OSy1r361T+LWNOuleyaf66XeW2aNiPDue2Vb4782Siz4p7SBms3c97JkZ+eeHGzFWvPq7tik9b JAQA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Add map_id_range_up() to verify that the full kernel id range can be mapped up in a given idmapping. This will be used in follow-up patches. Signed-off-by: Christian Brauner --- include/linux/uidgid.h | 6 ++++++ kernel/user_namespace.c | 26 +++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h index f85ec5613721..2dc767e08f54 100644 --- a/include/linux/uidgid.h +++ b/include/linux/uidgid.h @@ -132,6 +132,7 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid) u32 map_id_down(struct uid_gid_map *map, u32 id); u32 map_id_up(struct uid_gid_map *map, u32 id); +u32 map_id_range_up(struct uid_gid_map *map, u32 id, u32 count); #else @@ -186,6 +187,11 @@ static inline u32 map_id_down(struct uid_gid_map *map, u32 id) return id; } +static inline u32 map_id_range_up(struct uid_gid_map *map, u32 id, u32 count) +{ + return id; +} + static inline u32 map_id_up(struct uid_gid_map *map, u32 id) { return id; diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index aa0b2e47f2f2..682f40d5632d 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -238,7 +238,7 @@ EXPORT_SYMBOL(__put_user_ns); struct idmap_key { bool map_up; /* true -> id from kid; false -> kid from id */ u32 id; /* id to find */ - u32 count; /* == 0 unless used with map_id_range_down() */ + u32 count; }; /* @@ -343,16 +343,19 @@ u32 map_id_down(struct uid_gid_map *map, u32 id) * UID_GID_MAP_MAX_BASE_EXTENTS. */ static struct uid_gid_extent * -map_id_up_base(unsigned extents, struct uid_gid_map *map, u32 id) +map_id_range_up_base(unsigned extents, struct uid_gid_map *map, u32 id, u32 count) { unsigned idx; - u32 first, last; + u32 first, last, id2; + + id2 = id + count - 1; /* Find the matching extent */ for (idx = 0; idx < extents; idx++) { first = map->extent[idx].lower_first; last = first + map->extent[idx].count - 1; - if (id >= first && id <= last) + if (id >= first && id <= last && + (id2 >= first && id2 <= last)) return &map->extent[idx]; } return NULL; @@ -363,28 +366,28 @@ map_id_up_base(unsigned extents, struct uid_gid_map *map, u32 id) * Can only be called if number of mappings exceeds UID_GID_MAP_MAX_BASE_EXTENTS. */ static struct uid_gid_extent * -map_id_up_max(unsigned extents, struct uid_gid_map *map, u32 id) +map_id_range_up_max(unsigned extents, struct uid_gid_map *map, u32 id, u32 count) { struct idmap_key key; key.map_up = true; - key.count = 1; + key.count = count; key.id = id; return bsearch(&key, map->reverse, extents, sizeof(struct uid_gid_extent), cmp_map_id); } -u32 map_id_up(struct uid_gid_map *map, u32 id) +u32 map_id_range_up(struct uid_gid_map *map, u32 id, u32 count) { struct uid_gid_extent *extent; unsigned extents = map->nr_extents; smp_rmb(); if (extents <= UID_GID_MAP_MAX_BASE_EXTENTS) - extent = map_id_up_base(extents, map, id); + extent = map_id_range_up_base(extents, map, id, count); else - extent = map_id_up_max(extents, map, id); + extent = map_id_range_up_max(extents, map, id, count); /* Map the id or note failure */ if (extent) @@ -395,6 +398,11 @@ u32 map_id_up(struct uid_gid_map *map, u32 id) return id; } +u32 map_id_up(struct uid_gid_map *map, u32 id) +{ + return map_id_range_up(map, id, 1); +} + /** * make_kuid - Map a user-namespace uid pair into a kuid. * @ns: User namespace that the uid is in From patchwork Wed Jan 29 23:19:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13954229 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 9F27419D898 for ; Wed, 29 Jan 2025 23:20:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738192842; cv=none; b=fEJ7ExWpb5uEAYI612hlDv26ELEhYXCIjBARjpuWf+iXIMWUa4iJx2W7P8WlQYsYyV0UmtkFytxD71/cJzp3/XAf8ZzRtBnzWoUXjoWRY+pKsMjYfZ7vxlA/6iOBww45gyA1vk66++hnbdoafq4xy3QQ0TbGCP8ItSus/r5pWNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738192842; c=relaxed/simple; bh=Yi0G51p49bIoe58G/MX6QtWfJZ/7DtUi8LiQSMo8y7U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EIKBeWU9Ho8F27KGcdlsv/gs+ikYk8g8CTd8MLz0p7aUrSnF65bd22uvIS3RwrXEd0tor/nRjp3I9wjSyuIL4C02lw569ZM0js9/xGEGYiep71y6HYR3hyeQ+q8KljHnys3ZC6GVL7N+Ea7/cwmHeasjRpNf/e76Xt5qIoP2zTk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dZnZzEhg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dZnZzEhg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 419AFC4CED1; Wed, 29 Jan 2025 23:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738192842; bh=Yi0G51p49bIoe58G/MX6QtWfJZ/7DtUi8LiQSMo8y7U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=dZnZzEhgihbxiRT72tom7lKIYMjzeTFIaihLpOKI5m4Mc1lRLLVRyGYHgqYAToEsg /y6/DAn73bpXW67xB/NxRMATvJg/KxgWHNc91A4Kf1DprUycYVk32tFCp/ABs5m0aC f8rA6JEE4ZXolZjUKncpn8wJxevcz3Uk+Knu17k0yuG00kw9NnsAXTS56X9nefRKO5 Ds9eyo1zdCxbXMecGHsxYWSgljUDMgVLbXvE9OzdvfyxxkREhLH/xvO77OCUo0pfsS 4L88oNaE29rJ9lzpl0c8HUw5RDw9C3PnwJIRpBMUls5XVa7Q+7Lu1RS/9ZzWbOXK0d TamXRDoKwGxdg== From: Christian Brauner Date: Thu, 30 Jan 2025 00:19:52 +0100 Subject: [PATCH 2/4] statmount: allow to retrieve idmappings Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250130-work-mnt_idmap-statmount-v1-2-d4ced5874e14@kernel.org> References: <20250130-work-mnt_idmap-statmount-v1-0-d4ced5874e14@kernel.org> In-Reply-To: <20250130-work-mnt_idmap-statmount-v1-0-d4ced5874e14@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: Josef Bacik , Jeff Layton , Lennart Poettering , Daan De Meyer , Seth Forshee , Miklos Szeredi , Christian Brauner X-Mailer: b4 0.15-dev-d23a9 X-Developer-Signature: v=1; a=openpgp-sha256; l=9808; i=brauner@kernel.org; h=from:subject:message-id; bh=Yi0G51p49bIoe58G/MX6QtWfJZ/7DtUi8LiQSMo8y7U=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaTP2n54hXQSt3f32pjKpv8NvVY3F7ds1rCYW/XU5NI9p /wIcf6bHaUsDGJcDLJiiiwO7Sbhcst5KjYbZWrAzGFlAhnCwMUpABPhdmdkOHhwgpPRGxFmQ1bd d5nnUxv9+8Ik51VNu1QbvuZK5BauPIb/Li3vnmidtozRmNWinMI4R2Xfzob20M6nZaZ9jFPX/fN hAwA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 This adds the STATMOUNT_MNT_UIDMAP and STATMOUNT_MNT_GIDMAP options. It allows the retrieval of idmappings via statmount(). Currently it isn't possible to figure out what idmappings are applied to an idmapped mount. This information is often crucial. Before statmount() the only realistic options for an interface like this would have been to add it to /proc//fdinfo/ or to expose it in /proc//mountinfo. Both solution would have been pretty ugly and would've shown information that is of strong interest to some application but not all. statmount() is perfect for this. The idmappings applied to an idmapped mount are shown relative to the caller's user namespace. This is the most useful solution that doesn't risk leaking information or confuse the caller. For example, an idmapped mount might have been created with the following idmappings: mount --bind -o X-mount.idmap="0:10000:1000 2000:2000:1 3000:3000:1" /srv /opt Listing the idmappings through statmount() in the same context shows: mnt_id: 2147485088 mnt_parent_id: 2147484816 fs_type: btrfs mnt_root: /srv mnt_point: /opt mnt_opts: ssd,discard=async,space_cache=v2,subvolid=5,subvol=/ mnt_uidmap[0]: 0 10000 1000 mnt_uidmap[1]: 2000 2000 1 mnt_uidmap[2]: 3000 3000 1 mnt_gidmap[0]: 0 10000 1000 mnt_gidmap[1]: 2000 2000 1 mnt_gidmap[2]: 3000 3000 1 But the idmappings might not always be resolvablein the caller's user namespace. For example: unshare --user --map-root In this case statmount() will indicate the failure to resolve the idmappings in the caller's user namespace by listing 4294967295 aka (uid_t) -1 as the target of the mapping while still showing the source and range of the mapping: mnt_id: 2147485087 mnt_parent_id: 2147484016 fs_type: btrfs mnt_root: /srv mnt_point: /opt mnt_opts: ssd,discard=async,space_cache=v2,subvolid=5,subvol=/ mnt_uidmap[0]: 0 4294967295 1000 mnt_uidmap[1]: 2000 4294967295 1 mnt_uidmap[2]: 3000 4294967295 1 mnt_gidmap[0]: 0 4294967295 1000 mnt_gidmap[1]: 2000 4294967295 1 mnt_gidmap[2]: 3000 4294967295 1 Note that statmount() requires that the whole range must be resolvable in the caller's user namespace. If a subrange fails to map it will still list the map as not resolvable. This is a practical compromise to avoid having to find which subranges are resovable and wich aren't. Idmappings are listed as a string array with each mapping separated by zero bytes. This allows to retrieve the idmappings and immediately use them for writing to e.g., /proc//{g,u}id_map and it also allow for simple iteration like: if (stmnt->mask & STATMOUNT_MNT_UIDMAP) { const char *idmap = stmnt->str + stmnt->mnt_uidmap; for (size_t idx = 0; idx < stmnt->mnt_uidmap_nr; idx++) { printf("mnt_uidmap[%lu]: %s\n", idx, idmap); idmap += strlen(idmap) + 1; } } Signed-off-by: Christian Brauner --- fs/internal.h | 1 + fs/mnt_idmapping.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ fs/namespace.c | 43 +++++++++++++++++++++++++++++++++++++++- include/uapi/linux/mount.h | 8 +++++++- 4 files changed, 99 insertions(+), 2 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index e7f02ae1e098..db6094d5cb0b 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -338,3 +338,4 @@ static inline bool path_mounted(const struct path *path) return path->mnt->mnt_root == path->dentry; } void file_f_owner_release(struct file *file); +int statmount_mnt_idmap(struct mnt_idmap *idmap, struct seq_file *seq, bool uid_map); diff --git a/fs/mnt_idmapping.c b/fs/mnt_idmapping.c index 7b1df8cc2821..4aca8e3ba97e 100644 --- a/fs/mnt_idmapping.c +++ b/fs/mnt_idmapping.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "internal.h" @@ -334,3 +335,51 @@ void mnt_idmap_put(struct mnt_idmap *idmap) free_mnt_idmap(idmap); } EXPORT_SYMBOL_GPL(mnt_idmap_put); + +int statmount_mnt_idmap(struct mnt_idmap *idmap, struct seq_file *seq, bool uid_map) +{ + struct uid_gid_map *map, *map_up; + + if (idmap == &nop_mnt_idmap || idmap == &invalid_mnt_idmap) + return 0; + + /* + * Idmappings are shown relative to the caller's idmapping. + * This is both the most intuitive and most useful solution. + */ + if (uid_map) { + map = &idmap->uid_map; + map_up = ¤t_user_ns()->uid_map; + } else { + map = &idmap->gid_map; + map_up = ¤t_user_ns()->gid_map; + } + + for (u32 idx = 0; idx < map->nr_extents; idx++) { + uid_t lower; + struct uid_gid_extent *extent; + + if (map->nr_extents <= UID_GID_MAP_MAX_BASE_EXTENTS) + extent = &map->extent[idx]; + else + extent = &map->forward[idx]; + + /* + * Verify that the whole range of the mapping can be + * resolved in the caller's idmapping. If it cannot be + * resolved 1/4294967295 will be shown as the target of + * the mapping. The source and range are shown as a hint + * to the caller. + */ + lower = map_id_range_up(map_up, extent->lower_first, extent->count); + if (lower == (uid_t) -1) + seq_printf(seq, "%u %u %u", extent->first, -1, extent->count); + else + seq_printf(seq, "%u %u %u", extent->first, lower, extent->count); + seq->count++; /* mappings are separated by \0 */ + if (seq_has_overflowed(seq)) + return -EAGAIN; + } + + return map->nr_extents; +} diff --git a/fs/namespace.c b/fs/namespace.c index 4013fbac354a..535e4829061f 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -4915,6 +4915,7 @@ struct kstatmount { struct statmount __user *buf; size_t bufsize; struct vfsmount *mnt; + struct mnt_idmap *idmap; u64 mask; struct path root; struct statmount sm; @@ -5185,6 +5186,30 @@ static int statmount_opt_sec_array(struct kstatmount *s, struct seq_file *seq) return 0; } +static inline int statmount_mnt_uidmap(struct kstatmount *s, struct seq_file *seq) +{ + int ret; + + ret = statmount_mnt_idmap(s->idmap, seq, true); + if (ret < 0) + return ret; + + s->sm.mnt_uidmap_num = ret; + return 0; +} + +static inline int statmount_mnt_gidmap(struct kstatmount *s, struct seq_file *seq) +{ + int ret; + + ret = statmount_mnt_idmap(s->idmap, seq, false); + if (ret < 0) + return ret; + + s->sm.mnt_gidmap_num = ret; + return 0; +} + static int statmount_string(struct kstatmount *s, u64 flag) { int ret = 0; @@ -5226,6 +5251,14 @@ static int statmount_string(struct kstatmount *s, u64 flag) sm->sb_source = start; ret = statmount_sb_source(s, seq); break; + case STATMOUNT_MNT_UIDMAP: + sm->mnt_uidmap = start; + ret = statmount_mnt_uidmap(s, seq); + break; + case STATMOUNT_MNT_GIDMAP: + sm->mnt_gidmap = start; + ret = statmount_mnt_gidmap(s, seq); + break; default: WARN_ON_ONCE(true); return -EINVAL; @@ -5350,6 +5383,7 @@ static int do_statmount(struct kstatmount *s, u64 mnt_id, u64 mnt_ns_id, return err; s->root = root; + s->idmap = mnt_idmap(s->mnt); if (s->mask & STATMOUNT_SB_BASIC) statmount_sb_basic(s); @@ -5383,6 +5417,12 @@ static int do_statmount(struct kstatmount *s, u64 mnt_id, u64 mnt_ns_id, if (!err && s->mask & STATMOUNT_SB_SOURCE) err = statmount_string(s, STATMOUNT_SB_SOURCE); + if (!err && s->mask & STATMOUNT_MNT_UIDMAP) + err = statmount_string(s, STATMOUNT_MNT_UIDMAP); + + if (!err && s->mask & STATMOUNT_MNT_GIDMAP) + err = statmount_string(s, STATMOUNT_MNT_GIDMAP); + if (!err && s->mask & STATMOUNT_MNT_NS_ID) statmount_mnt_ns_id(s, ns); @@ -5406,7 +5446,8 @@ static inline bool retry_statmount(const long ret, size_t *seq_size) #define STATMOUNT_STRING_REQ (STATMOUNT_MNT_ROOT | STATMOUNT_MNT_POINT | \ STATMOUNT_FS_TYPE | STATMOUNT_MNT_OPTS | \ STATMOUNT_FS_SUBTYPE | STATMOUNT_SB_SOURCE | \ - STATMOUNT_OPT_ARRAY | STATMOUNT_OPT_SEC_ARRAY) + STATMOUNT_OPT_ARRAY | STATMOUNT_OPT_SEC_ARRAY | \ + STATMOUNT_MNT_UIDMAP | STATMOUNT_MNT_GIDMAP) static int prepare_kstatmount(struct kstatmount *ks, struct mnt_id_req *kreq, struct statmount __user *buf, size_t bufsize, diff --git a/include/uapi/linux/mount.h b/include/uapi/linux/mount.h index c07008816aca..0be6ac4c1624 100644 --- a/include/uapi/linux/mount.h +++ b/include/uapi/linux/mount.h @@ -179,7 +179,11 @@ struct statmount { __u32 opt_array; /* [str] Array of nul terminated fs options */ __u32 opt_sec_num; /* Number of security options */ __u32 opt_sec_array; /* [str] Array of nul terminated security options */ - __u64 __spare2[46]; + __u32 mnt_uidmap_num; /* Number of uid mappings */ + __u32 mnt_uidmap; /* [str] Array of uid mappings (as seen from callers namespace) */ + __u32 mnt_gidmap_num; /* Number of gid mappings */ + __u32 mnt_gidmap; /* [str] Array of gid mappings (as seen from callers namespace) */ + __u64 __spare2[44]; char str[]; /* Variable size part containing strings */ }; @@ -217,6 +221,8 @@ struct mnt_id_req { #define STATMOUNT_SB_SOURCE 0x00000200U /* Want/got sb_source */ #define STATMOUNT_OPT_ARRAY 0x00000400U /* Want/got opt_... */ #define STATMOUNT_OPT_SEC_ARRAY 0x00000800U /* Want/got opt_sec... */ +#define STATMOUNT_MNT_UIDMAP 0x00001000U /* Want/got uidmap... */ +#define STATMOUNT_MNT_GIDMAP 0x00002000U /* Want/got gidmap... */ /* * Special @mnt_id values that can be passed to listmount From patchwork Wed Jan 29 23:19:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13954230 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B74381B4F02 for ; Wed, 29 Jan 2025 23:20:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738192844; cv=none; b=J6qiNmHVyGAGwOszet6ZEv9Fjt+sXSLkiN5P8REETvPnVNZmqOD5aAb93FWnSo+82Ovb013H7rqJ3Wd5odE6YM+U8uCmZM669CCHWSn4zcKyBLORv5NfwQin6KOyBAxT58bHdMVs0vh/46i5qy8BPDDwl0F1CxBwhF3Y/l6gaDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738192844; c=relaxed/simple; bh=vDzcH+jxvipj5mOU7vGgaaam7ebEwSwPJMT1JIlWZV4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rc/3ogtcFWEAZsNFZ06pAPIB16TiLG4I+IkiR2gGvcAzErbV2ovbaI2SVBqjWDTu1e3B5KoOeWD9DldDYri8lZEgXKpwfzOQ62y6eVET78gD8mt8lhsnmHlcc+bU1DwCPBgCTGV+zLVLYZQic7e7z/UTAbTCI+U/hZ2OkwgAUCY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FV7Y9Bmm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FV7Y9Bmm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95D46C4CEE4; Wed, 29 Jan 2025 23:20:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738192844; bh=vDzcH+jxvipj5mOU7vGgaaam7ebEwSwPJMT1JIlWZV4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=FV7Y9Bmm2FT3ezSWq2BJVa0UJwpYQu5a53wa1xgE8Doipg/yn7JeLGRQXuz9uEpoz F7SMZWD3A2ZbBQefKjNwb4nVnIoF5RKmSPpLLbOHo6mXYeKzpXzfk48FsEkhi5/ui6 QyOU1Lmv8viV2TvOXxt97OtHpC4t3zbO3hIPVQIseWVHmf8h+XK5B1p0SF/5D0koHl tkyXDhByDuWWrQt4jAJGaBfytehu8fHzqEM8kKBEOPyxfI84rjdf1p2cZYA6aT7YA1 gNSqDrhL9sf0xKGarUvYzZP8Jx9ByKyXRmkdPJ8N0Hs7oObOHdLh861YDHJYuHlvQ+ BdyaLBoRvQr2w== From: Christian Brauner Date: Thu, 30 Jan 2025 00:19:53 +0100 Subject: [PATCH 3/4] samples/vfs: check whether flag was raised Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250130-work-mnt_idmap-statmount-v1-3-d4ced5874e14@kernel.org> References: <20250130-work-mnt_idmap-statmount-v1-0-d4ced5874e14@kernel.org> In-Reply-To: <20250130-work-mnt_idmap-statmount-v1-0-d4ced5874e14@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: Josef Bacik , Jeff Layton , Lennart Poettering , Daan De Meyer , Seth Forshee , Miklos Szeredi , Christian Brauner X-Mailer: b4 0.15-dev-d23a9 X-Developer-Signature: v=1; a=openpgp-sha256; l=1326; i=brauner@kernel.org; h=from:subject:message-id; bh=vDzcH+jxvipj5mOU7vGgaaam7ebEwSwPJMT1JIlWZV4=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaTP2n64+be6XdqOX9Mv8lQ+4nVLOfAyKjZveaXv2Tefq 172FfrodJSyMIhxMciKKbI4tJuEyy3nqdhslKkBM4eVCWQIAxenAEzEeDUjw5GsriXfmtrmfv5z fXNIfX3vpx15l9pzj+2Z2e7ab6gwJZThn/1VkfTf+owP1EStNisrzX1449TlA64VSS80Wv6EXX3 FzwYA X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 For string options the kernel will raise the corresponding flag only if the string isn't empty. So check for the flag. Signed-off-by: Christian Brauner --- samples/vfs/test-list-all-mounts.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/samples/vfs/test-list-all-mounts.c b/samples/vfs/test-list-all-mounts.c index 1a02ea4593e3..ce272ded8a79 100644 --- a/samples/vfs/test-list-all-mounts.c +++ b/samples/vfs/test-list-all-mounts.c @@ -138,10 +138,11 @@ int main(int argc, char *argv[]) printf("mnt_id:\t\t%" PRIu64 "\nmnt_parent_id:\t%" PRIu64 "\nfs_type:\t%s\nmnt_root:\t%s\nmnt_point:\t%s\nmnt_opts:\t%s\n\n", (uint64_t)stmnt->mnt_id, (uint64_t)stmnt->mnt_parent_id, - stmnt->str + stmnt->fs_type, - stmnt->str + stmnt->mnt_root, - stmnt->str + stmnt->mnt_point, - stmnt->str + stmnt->mnt_opts); + (stmnt->mask & STATMOUNT_FS_TYPE) ? stmnt->str + stmnt->fs_type : "", + (stmnt->mask & STATMOUNT_MNT_ROOT) ? stmnt->str + stmnt->mnt_root : "", + (stmnt->mask & STATMOUNT_MNT_POINT) ? stmnt->str + stmnt->mnt_point : "", + (stmnt->mask & STATMOUNT_MNT_OPTS) ? stmnt->str + stmnt->mnt_opts : ""); + free(stmnt); } } From patchwork Wed Jan 29 23:19:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13954231 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0AF9C19D898 for ; Wed, 29 Jan 2025 23:20:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738192847; cv=none; b=UnQTRQuwallLS4EL6wKaGI30ANzf+U/0+KYGDw+hMhsJfmFEGQl+3pEQgh9ff29bB9d/mr3Pu4G1UEthZX3WjdjbQyjiGumlzwFZgeBuctWMEFjLlc+W/TqUBzqDNbR4Io+ZrGW+BnLvHqiNCfjDfXHJ0Qpa8r5aC5swJdz3Br4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738192847; c=relaxed/simple; bh=lp1S2UEzuPgR93/FsTP8aGAopmV7Np/IryQX4ELnQgc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LpG06XlVMMO5BN4CdUkU4tkq+f8O9EolZxyiNUSm02nrvTHB+0wLiDa41iQhM70uaO0StBP7uDyp2YczTyEOo9TaxSiShkZHePGLdViSiIhJ2hFaiaqqd9QMEKVkJSITycU5y9tzVbGtq7EDCfU/Mfy6AwnwKz3r7+WosAOvW0w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iZh83Top; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iZh83Top" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A122DC4CED1; Wed, 29 Jan 2025 23:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738192846; bh=lp1S2UEzuPgR93/FsTP8aGAopmV7Np/IryQX4ELnQgc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=iZh83TopFHygjRUjOAsTL5nwvE4cgOX9WCTm/Vx4WayFgzR5/ugU8v0wSP74ydhAk wofbj0xFKdSR6OKZGbcdXN6RMP5CqKbEsw70fguOLTy3UPHH0f28Eu+pb60SNi7VTe 4Fp5FxCcIXPw52XZiBLPMVWI7zSlpcmu7ndnmweuQnzk4Q8AO4yG6pOMvbHyNB39l2 su+911jVP67Q+ETVYtQWI7MRHWy9CU+enKL2We5b/RQgHKftOTaNTKo35uHaW9SR9P 97sDuOljJ6YuX3rx/IqqiV3/2W8BgDPLEQmuLJ6CXCUcXe65xWe/OOfRoxiwPH0BpJ Qxajj8or6REWA== From: Christian Brauner Date: Thu, 30 Jan 2025 00:19:54 +0100 Subject: [PATCH 4/4] samples/vfs: add STATMOUNT_MNT_{G,U}IDMAP Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250130-work-mnt_idmap-statmount-v1-4-d4ced5874e14@kernel.org> References: <20250130-work-mnt_idmap-statmount-v1-0-d4ced5874e14@kernel.org> In-Reply-To: <20250130-work-mnt_idmap-statmount-v1-0-d4ced5874e14@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: Josef Bacik , Jeff Layton , Lennart Poettering , Daan De Meyer , Seth Forshee , Miklos Szeredi , Christian Brauner X-Mailer: b4 0.15-dev-d23a9 X-Developer-Signature: v=1; a=openpgp-sha256; l=3480; i=brauner@kernel.org; h=from:subject:message-id; bh=lp1S2UEzuPgR93/FsTP8aGAopmV7Np/IryQX4ELnQgc=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaTP2n44qedLLNMCf+ajr/6uYFMrz7v0cZpkzWlmvjOdS 9Qm/Qm62FHKwiDGxSArpsji0G4SLrecp2KzUaYGzBxWJpAhDFycAjARiS+MDAs0Ljdd9yqWS5oU aZiad8GfW+WYUXL+r9ybgsXMk3K2OjL8M4/6PP15inRHX+paH6HaFVnHOk90frXdEdcktF+S8cN tHgA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Illustrate how to use STATMOUNT_MNT_{G,U}IDMAP. Signed-off-by: Christian Brauner --- samples/vfs/samples-vfs.h | 14 +++++++++++++- samples/vfs/test-list-all-mounts.c | 26 ++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/samples/vfs/samples-vfs.h b/samples/vfs/samples-vfs.h index 103e1e7c4cec..a7ff4e79e8e6 100644 --- a/samples/vfs/samples-vfs.h +++ b/samples/vfs/samples-vfs.h @@ -42,7 +42,11 @@ struct statmount { __u32 opt_array; /* [str] Array of nul terminated fs options */ __u32 opt_sec_num; /* Number of security options */ __u32 opt_sec_array; /* [str] Array of nul terminated security options */ - __u64 __spare2[46]; + __u32 mnt_uidmap_num; /* Number of uid mappings */ + __u32 mnt_uidmap; /* [str] Array of uid mappings */ + __u32 mnt_gidmap_num; /* Number of gid mappings */ + __u32 mnt_gidmap; /* [str] Array of gid mappings */ + __u64 __spare2[44]; char str[]; /* Variable size part containing strings */ }; @@ -158,6 +162,14 @@ struct mnt_ns_info { #define STATX_MNT_ID_UNIQUE 0x00004000U /* Want/got extended stx_mount_id */ #endif +#ifndef STATMOUNT_MNT_UIDMAP +#define STATMOUNT_MNT_UIDMAP 0x00001000U /* Want/got uidmap... */ +#endif + +#ifndef STATMOUNT_MNT_GIDMAP +#define STATMOUNT_MNT_GIDMAP 0x00002000U /* Want/got gidmap... */ +#endif + #ifndef MOUNT_ATTR_RDONLY #define MOUNT_ATTR_RDONLY 0x00000001 /* Mount read-only */ #endif diff --git a/samples/vfs/test-list-all-mounts.c b/samples/vfs/test-list-all-mounts.c index ce272ded8a79..bb3b83d8f1d7 100644 --- a/samples/vfs/test-list-all-mounts.c +++ b/samples/vfs/test-list-all-mounts.c @@ -128,14 +128,16 @@ int main(int argc, char *argv[]) STATMOUNT_MNT_POINT | STATMOUNT_MNT_NS_ID | STATMOUNT_MNT_OPTS | - STATMOUNT_FS_TYPE, 0); + STATMOUNT_FS_TYPE | + STATMOUNT_MNT_UIDMAP | + STATMOUNT_MNT_GIDMAP, 0); if (!stmnt) { printf("Failed to statmount(%" PRIu64 ") in mount namespace(%" PRIu64 ")\n", (uint64_t)last_mnt_id, (uint64_t)info.mnt_ns_id); continue; } - printf("mnt_id:\t\t%" PRIu64 "\nmnt_parent_id:\t%" PRIu64 "\nfs_type:\t%s\nmnt_root:\t%s\nmnt_point:\t%s\nmnt_opts:\t%s\n\n", + printf("mnt_id:\t\t%" PRIu64 "\nmnt_parent_id:\t%" PRIu64 "\nfs_type:\t%s\nmnt_root:\t%s\nmnt_point:\t%s\nmnt_opts:\t%s\n", (uint64_t)stmnt->mnt_id, (uint64_t)stmnt->mnt_parent_id, (stmnt->mask & STATMOUNT_FS_TYPE) ? stmnt->str + stmnt->fs_type : "", @@ -143,6 +145,26 @@ int main(int argc, char *argv[]) (stmnt->mask & STATMOUNT_MNT_POINT) ? stmnt->str + stmnt->mnt_point : "", (stmnt->mask & STATMOUNT_MNT_OPTS) ? stmnt->str + stmnt->mnt_opts : ""); + if (stmnt->mask & STATMOUNT_MNT_UIDMAP) { + const char *idmap = stmnt->str + stmnt->mnt_uidmap; + + for (size_t idx = 0; idx < stmnt->mnt_uidmap_num; idx++) { + printf("mnt_uidmap[%lu]:\t%s\n", idx, idmap); + idmap += strlen(idmap) + 1; + } + } + + if (stmnt->mask & STATMOUNT_MNT_GIDMAP) { + const char *idmap = stmnt->str + stmnt->mnt_gidmap; + + for (size_t idx = 0; idx < stmnt->mnt_gidmap_num; idx++) { + printf("mnt_gidmap[%lu]:\t%s\n", idx, idmap); + idmap += strlen(idmap) + 1; + } + } + + printf("\n"); + free(stmnt); } }