RDMA/core: Validate cpu_id against nr_cpu_ids in DMAH alloc
Subsystems (2)
PATCH 1/1 RDMA/core: Validate cpu_id against nr_cpu_ids in DMAH alloc
The cpu_id attribute supplied by user space through UVERBS_ATTR_ALLOC_DMAH_CPU_ID is passed directly to cpumask_test_cpu() without first verifying that the value is within the valid CPU range.
Passing such untrusted data to cpumask_test_cpu() may lead to an out-of-bounds read of the underlying cpumask bitmap: the helper expands to a test_bit() that indexes the bitmap by cpu_id / BITS_PER_LONG with no bound check.
In addition, on kernels built with CONFIG_DEBUG_PER_CPU_MAPS it trips the WARN_ON_ONCE() in cpumask_check(); combined with panic_on_warn this turns a bad user input into a machine reboot.
Reject any cpu_id that is not smaller than nr_cpu_ids with -EINVAL before it is used.
Reported by Smatch.
--- drivers/infiniband/core/uverbs_std_types_dmah.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/infiniband/core/uverbs_std_types_dmah.c +5 -0
@@ -47,6 +47,11 @@ static int UVERBS_HANDLER(UVERBS_METHOD_DMAH_ALLOC)(if (ret) goto err; +if (dmah->cpu_id >= nr_cpu_ids) { + ret = -EINVAL ; + goto err; + } +if (!cpumask_test_cpu (dmah->cpu_id, current->cpus_ptr)) { ret = -EPERM ; goto err;
Signature · 1 line
2.18.1
Quoted 18 lines · Yishai Hadas
The
cpu_idattribute supplied by user space throughUVERBS_ATTR_ALLOC_DMAH_CPU_IDis passed directly tocpumask_test_cpu()without first verifying that the value is within the valid CPU range.Passing such untrusted data to
cpumask_test_cpu()may lead to an out-of-bounds read of the underlying cpumask bitmap: the helper expands to atest_bit()that indexes the bitmap bycpu_id/BITS_PER_LONGwith no bound check.In addition, on kernels built with
CONFIG_DEBUG_PER_CPU_MAPSit trips theWARN_ON_ONCE()incpumask_check(); combined withpanic_on_warnthis turns a bad user input into a machine reboot.Reject any
cpu_idthat is not smaller thannr_cpu_idswith-EINVALbefore it is used.Reported by Smatch.
Quoted 8 lines
Fixes d83edab562a4 ("RDMA/core: Introduce a DMAH object and its alloc/free APIs")Reported-by Dan Carpenter <[email protected]>Signed-off-by Yishai Hadas <[email protected]>--- drivers/infiniband/core/uverbs_std_types_dmah.c | 5 +++++ 1 file changed, 5 insertions(+)
Applied to for-rc
Thanks,
Jason