[PATCH v2] fs/mnt_idmapping.c: Return -EINVAL when no map is written

From: Taylor Jackson via B4 Relay
Date: Wed Feb 07 2024 - 22:03:13 EST


From: Taylor Jackson <taylor.a.jackson@xxxxxx>

Currently, it is possible to create an idmapped mount using a user
namespace without any mappings. However, this yields an idmapped
mount that doesn't actually map the ids. With the following change,
it will no longer be possible to create an idmapped mount when using
a user namespace with no mappings, and will instead return EINVAL,
an “invalid argument” error code.

Reviewed-by: Christian Brauner <brauner@xxxxxxxxxx>
Signed-off-by: Taylor Jackson <taylor.a.jackson@xxxxxx>
---
Changes in v2:
- Updated commit message based on feedback
- Link to v1: https://lore.kernel.org/r/20240206-mnt-idmap-inval-v1-1-68bfabb97533@xxxxxx
---
fs/mnt_idmapping.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/mnt_idmapping.c b/fs/mnt_idmapping.c
index 64c5205e2b5e..3c60f1eaca61 100644
--- a/fs/mnt_idmapping.c
+++ b/fs/mnt_idmapping.c
@@ -214,7 +214,7 @@ static int copy_mnt_idmap(struct uid_gid_map *map_from,
* anything at all.
*/
if (nr_extents == 0)
- return 0;
+ return -EINVAL;

/*
* Here we know that nr_extents is greater than zero which means

---
base-commit: 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478
change-id: 20240206-mnt-idmap-inval-18d3a35f83fd

Best regards,
--
Taylor Jackson <taylor.a.jackson@xxxxxx>