Reject invalid mount id values early
Christian Brauner
maintainercover Reject invalid mount id values early
Two small fixes to avoid doing unnecessary work if userspace provided invalid mount id values to either statmount() or listmount().
Thanks!
Christian
Signed-off-by Christian Brauner <[email protected]>
---
---
base-commit: 682d12148c264484562f130f0c8584839ebc36fc
change-id: 20240704-work-mount-fixes-cb4d784a1fb0
Christian Brauner
maintainerPATCH 1/2 fs: refuse mnt id requests with invalid ids early
Unique mount ids start past the last valid old mount id value to not confuse the two so reject invalid values early in copy_mnt_id_req().
Signed-off-by Christian Brauner <[email protected]>
--- fs/namespace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/namespace.c +5 -1
@@ -70,7 +70,8 @@ static DEFINE_IDA(mnt_id_ida);static DEFINE_IDA (mnt_group_ida);/* Don't allow confusion with old 32bit mount ID */ -static atomic64_t mnt_id_ctr =ATOMIC64_INIT (1ULL <<32 ); +#define MNT_UNIQUE_ID_OFFSET (1ULL << 32) +static atomic64_t mnt_id_ctr =ATOMIC64_INIT (MNT_UNIQUE_ID_OFFSET );static struct hlist_head *mount_hashtable__ro_after_init ;static struct hlist_head *mountpoint_hashtable__ro_after_init ;
@@ -5235,6 +5236,9 @@ static int copy_mnt_id_req(const struct mnt_id_req __user *req,return ret;if (kreq->spare !=0 )return -EINVAL ; +/* The first valid unique mount id is MNT_UNIQUE_ID_OFFSET + 1. */ +if (kreq->mnt_id <=MNT_UNIQUE_ID_OFFSET ) +return -EINVAL ;return 0 ; }
Signature · 1 line
2.43.0
Christian Brauner
maintainerPATCH 2/2 fs: reject invalid last mount id early
In reply to Christian BraunerUnique mount ids start past the last valid old mount id value to not confuse the two. If a last mount id has been specified, reject any invalid values early.
Signed-off-by Christian Brauner <[email protected]>
--- fs/namespace.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/namespace.c +7 -1
@@ -5369,6 +5369,7 @@ SYSCALL_DEFINE4(listmount, const struct mnt_id_req __user *, req,const size_t maxcount =1000000 ; struct mnt_namespace *ns __free(mnt_ns_release) = NULL;struct mnt_id_req kreq; +u64 last_mnt_id;ssize_t ret;if (flags & ~LISTMOUNT_REVERSE )
@@ -5389,6 +5390,11 @@ SYSCALL_DEFINE4(listmount, const struct mnt_id_req __user *, req,if (ret)return ret; + last_mnt_id = kreq.param; +/* The first valid unique mount id is MNT_UNIQUE_ID_OFFSET + 1. */ +if (last_mnt_id !=0 && last_mnt_id <=MNT_UNIQUE_ID_OFFSET ) +return -EINVAL ; + kmnt_ids =kvmalloc_array (nr_mnt_ids,sizeof (*kmnt_ids),GFP_KERNEL_ACCOUNT );if (!kmnt_ids)
@@ -5403,7 +5409,7 @@ SYSCALL_DEFINE4(listmount, const struct mnt_id_req __user *, req,return -ENOENT ;scoped_guard (rwsem_read, &namespace_sem) - ret = do_listmount(ns, kreq.mnt_id, kreq.param, kmnt_ids, + ret = do_listmount(ns, kreq.mnt_id, last_mnt_id, kmnt_ids, nr_mnt_ids, (flags &LISTMOUNT_REVERSE ));if (copy_to_user (mnt_ids, kmnt_ids, ret *sizeof (*mnt_ids)))
Signature · 1 line
2.43.0