ublk: clear server ownership before aborting in-flight requests#822
ublk: clear server ownership before aborting in-flight requests#822blktests-ci[bot] wants to merge 1 commit into
Conversation
|
Upstream branch: aa54b1d |
b1870f6 to
ca57796
Compare
|
Upstream branch: 70eda68 |
abaf827 to
8338f32
Compare
ca57796 to
c1feb59
Compare
|
Upstream branch: 8bc67e4 |
8338f32 to
e76d47e
Compare
c1feb59 to
ea833a1
Compare
|
Upstream branch: 6779b50 |
e76d47e to
4279e27
Compare
ea833a1 to
7af85d1
Compare
|
Upstream branch: 79bd2dd |
4279e27 to
96c624c
Compare
7af85d1 to
de94ac7
Compare
|
Upstream branch: eed108e |
96c624c to
1987a11
Compare
de94ac7 to
86d8d37
Compare
|
Upstream branch: e8c2f9f |
1987a11 to
3dec49f
Compare
86d8d37 to
9805659
Compare
|
Upstream branch: eb3f4b7 |
3dec49f to
9af9f1d
Compare
9805659 to
3f4a345
Compare
|
Upstream branch: 8fde5d1 |
9af9f1d to
f147f69
Compare
3f4a345 to
c6dc343
Compare
|
Upstream branch: e43ffb6 |
f147f69 to
c052545
Compare
c6dc343 to
fc36596
Compare
[BUG] A stale UBLK_IO_COMMIT_AND_FETCH_REQ can reach the normal completion path after ublk has already aborted the in-flight request, leading to a use-after-free in map/unmap mode: BUG: KASAN: use-after-free in ublk_copy_io_pages drivers/block/ublk_drv.c:946 [inline] BUG: KASAN: use-after-free in ublk_copy_user_pages+0x83c/0xcc0 drivers/block/ublk_drv.c:1013 Write of size 4096 at addr ffff88800ce2a000 by task ublk.fsfuzz/275 Call Trace: ... ublk_copy_io_pages drivers/block/ublk_drv.c:946 [inline] ublk_copy_user_pages+0x83c/0xcc0 drivers/block/ublk_drv.c:1013 ublk_unmap_io+0x2bb/0x350 drivers/block/ublk_drv.c:1076 __ublk_complete_rq drivers/block/ublk_drv.c:1188 [inline] ublk_ch_uring_cmd_local+0x157c/0x2180 drivers/block/ublk_drv.c:2477 ublk_ch_uring_cmd+0x42/0x640 drivers/block/ublk_drv.c:2561 io_uring_cmd+0x26f/0x570 io_uring/uring_cmd.c:263 __io_issue_sqe+0xc2/0x760 io_uring/io_uring.c:1826 io_issue_sqe+0xdd/0x11e0 io_uring/io_uring.c:1849 io_queue_sqe io_uring/io_uring.c:2076 [inline] io_submit_sqe io_uring/io_uring.c:2336 [inline] io_submit_sqes+0x806/0x2390 io_uring/io_uring.c:2449 __do_sys_io_uring_enter+0x5c0/0x13a0 io_uring/io_uring.c:3516 __se_sys_io_uring_enter io_uring/io_uring.c:3455 [inline] __x64_sys_io_uring_enter+0xe5/0x1c0 io_uring/io_uring.c:3455 x64_sys_call+0x2419/0x26a0 arch/x86/include/generated/asm/syscalls_64.h:427 ... [CAUSE] commit e63d222 ("ublk: simplify aborting ublk request") removed the abort-only completion state and now __ublk_fail_req() fails or requeues the request without first revoking UBLK_IO_FLAG_OWNED_BY_SRV. That leaves the tag looking as if it is still owned by the ublk server, so a stale COMMIT_AND_FETCH_REQ can pass the ownership check, reuse io->req, and call __ublk_complete_rq() after the request has already been ended. In map mode that drives ublk_unmap_io() into freed request pages. [FIX] Clear UBLK_IO_FLAG_OWNED_BY_SRV as soon as abort starts in __ublk_fail_req(). Once ownership is revoked, any stale COMMIT_AND_FETCH_REQ fails before touching io->req, so the completion path can no longer copy into freed bio pages. Fixes: e63d222 ("ublk: simplify aborting ublk request") Signed-off-by: ZhengYuan Huang <gality369@gmail.com>
|
Upstream branch: ba3e43a |
c052545 to
08da582
Compare
Pull request for series with
subject: ublk: clear server ownership before aborting in-flight requests
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1093401