Commit d3e9940d authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Long Li
Browse files

io_uring: check for overflows in io_pin_pages

mainline inclusion
from mainline-v6.10-rc2
commit 0c0a4eae26ac78379d0c1db053de168a8febc6c9
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBEAFR
CVE: CVE-2024-53187

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0c0a4eae26ac78379d0c1db053de168a8febc6c9



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

WARNING: CPU: 0 PID: 5834 at io_uring/memmap.c:144 io_pin_pages+0x149/0x180 io_uring/memmap.c:144
CPU: 0 UID: 0 PID: 5834 Comm: syz-executor825 Not tainted 6.12.0-next-20241118-syzkaller #0
Call Trace:
 <TASK>
 __io_uaddr_map+0xfb/0x2d0 io_uring/memmap.c:183
 io_rings_map io_uring/io_uring.c:2611 [inline]
 io_allocate_scq_urings+0x1c0/0x650 io_uring/io_uring.c:3470
 io_uring_create+0x5b5/0xc00 io_uring/io_uring.c:3692
 io_uring_setup io_uring/io_uring.c:3781 [inline]
 ...
 </TASK>

io_pin_pages()'s uaddr parameter came directly from the user and can be
garbage. Don't just add size to it as it can overflow.

Cc: stable@vger.kernel.org
Reported-by: default avatar <syzbot+2159cbb522b02847c053@syzkaller.appspotmail.com>
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/1b7520ddb168e1d537d64be47414a0629d0d8f8f.1732581026.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Conflicts:
	io_uring/rsrc.c
	io_uring/memmap.c
[Conflicts due to io_pin_pages() move to io_uring/memmap.c in mainline]
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 808cdaaa
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -879,7 +879,12 @@ struct page **io_pin_pages(unsigned long ubuf, unsigned long len, int *npages)
	struct page **pages = NULL;
	int pret, ret = -ENOMEM;

	end = (ubuf + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
	if (check_add_overflow(ubuf, len, &end))
		return ERR_PTR(-EOVERFLOW);
	if (check_add_overflow(end, PAGE_SIZE - 1, &end))
		return ERR_PTR(-EOVERFLOW);

	end = end >> PAGE_SHIFT;
	start = ubuf >> PAGE_SHIFT;
	nr_pages = end - start;