summaryrefslogtreecommitdiff
path: root/fs/mnt_idmapping.c
diff options
context:
space:
mode:
authorTaylor Jackson <taylor.a.jackson@me.com>2024-02-08 03:02:54 +0000
committerChristian Brauner <brauner@kernel.org>2024-02-08 10:12:37 +0100
commitdacfd001eaf252a81537aece602ae2fc16e6ebd5 (patch)
treefc1400c1485a276d997bcf4cc198424019a17f87 /fs/mnt_idmapping.c
parentd31563b5f9bb601a805c4a1b491edf69ada79688 (diff)
fs/mnt_idmapping.c: Return -EINVAL when no map is written
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@kernel.org> Signed-off-by: Taylor Jackson <taylor.a.jackson@me.com> Link: https://lore.kernel.org/r/20240208-mnt-idmap-inval-v2-1-58ef26d194e0@me.com Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/mnt_idmapping.c')
-rw-r--r--fs/mnt_idmapping.c2
1 files changed, 1 insertions, 1 deletions
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