Commit aea849ad authored by Fedor Pchelkin's avatar Fedor Pchelkin Committed by Kaixiong Yu
Browse files

dma-mapping: benchmark: fix node id validation 

stable inclusion
from stable-v6.6.33
commit 34a816d8735f3924b74be8e5bf766ade1f3bd10b
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA7DBN
CVE: CVE-2024-34777

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=34a816d8735f3924b74be8e5bf766ade1f3bd10b



--------------------------------

[ Upstream commit 1ff05e723f7ca30644b8ec3fb093f16312e408ad ]

While validating node ids in map_benchmark_ioctl(), node_possible() may
be provided with invalid argument outside of [0,MAX_NUMNODES-1] range
leading to:

BUG: KASAN: wild-memory-access in map_benchmark_ioctl (kernel/dma/map_benchmark.c:214)
Read of size 8 at addr 1fffffff8ccb6398 by task dma_map_benchma/971
CPU: 7 PID: 971 Comm: dma_map_benchma Not tainted 6.9.0-rc6 #37
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996)
Call Trace:
 <TASK>
dump_stack_lvl (lib/dump_stack.c:117)
kasan_report (mm/kasan/report.c:603)
kasan_check_range (mm/kasan/generic.c:189)
variable_test_bit (arch/x86/include/asm/bitops.h:227) [inline]
arch_test_bit (arch/x86/include/asm/bitops.h:239) [inline]
_test_bit at (include/asm-generic/bitops/instrumented-non-atomic.h:142) [inline]
node_state (include/linux/nodemask.h:423) [inline]
map_benchmark_ioctl (kernel/dma/map_benchmark.c:214)
full_proxy_unlocked_ioctl (fs/debugfs/file.c:333)
__x64_sys_ioctl (fs/ioctl.c:890)
do_syscall_64 (arch/x86/entry/common.c:83)
entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130)

Compare node ids with sane bounds first. NUMA_NO_NODE is considered a
special valid case meaning that benchmarking kthreads won't be bound to a
cpuset of a given node.

Found by Linux Verification Center (linuxtesting.org).

Fixes: 65789daa ("dma-mapping: add benchmark support for streaming DMA APIs")
Signed-off-by: default avatarFedor Pchelkin <pchelkin@ispras.ru>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKaixiong Yu <yukaixiong@huawei.com>
parent ed16c732

kernel/dma/map_benchmark.c

+2 −1
Original line number Diff line number Diff line
@@ -228,7 +228,8 @@ static long map_benchmark_ioctl(struct file *file, unsigned int cmd, 
		}



		if (map->bparam.node != NUMA_NO_NODE &&

		    !node_possible(map->bparam.node)) {

		    (map->bparam.node < 0 || map->bparam.node >= MAX_NUMNODES ||

		     !node_possible(map->bparam.node))) {

			pr_err("invalid numa node\n");

			return -EINVAL;

		}