ublk: harden user buffer handling
Subsystems (2)
v2 cover ublk: harden user buffer handling
For ublk devices not using user copy or zero copy, the ublk driver copies request data to/from an arbitrary buffer provided by the userspace ublk server on each I/O.
Fix several bugs where the kernel driver is overly trusting of the userspace buffer. Ensure that an invalid userspace buffer at worst results in a failed or requeued I/O and can't trigger panics or undefined behavior.
v2:
- Check import_ubuf() return value (Ming)
- Avoid calling blk_update_request() with nr_bytes=0
v1: https://lore.kernel.org/linux-block/[email protected]/
Caleb Sander Mateos (3):
ublk: check import_ubuf() return value
ublk: check for ublk_unmap_io() returning 0
ublk: remove WARN_ON_ONCE() in ublk_unmap_io()
drivers/block/ublk_drv.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
Signature · 1 line
2.54.0
PATCH v2 1/3 ublk: check import_ubuf() return value
import_ubuf() can fail if the address range (provided by the userspace ublk server) is outside the allowed user address space. Return that 0 bytes were copied if import_ubuf() fails rather than passing an uninitialized struct iov_iter to ublk_copy_user_pages().
--- drivers/block/ublk_drv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/block/ublk_drv.c +8 -2
@@ -1473,11 +1473,14 @@ static unsigned int ublk_map_io(const struct ublk_queue *ubq,*/ if (ublk_need_map_req (req)) {struct iov_iter iter;const int dir =ITER_DEST ; -import_ubuf (dir,u64_to_user_ptr (io->buf.addr), rq_bytes, &iter); +if (import_ubuf (dir,u64_to_user_ptr (io->buf.addr), rq_bytes, + &iter) <0 ) +return 0 ; +return ublk_copy_user_pages (req,0 , &iter, dir); }return rq_bytes; }
@@ -1494,11 +1497,14 @@ static unsigned int ublk_unmap_io(bool need_map,struct iov_iter iter;const int dir =ITER_SOURCE ;WARN_ON_ONCE (io->res > rq_bytes); -import_ubuf (dir,u64_to_user_ptr (io->buf.addr), io->res, &iter); +if (import_ubuf (dir,u64_to_user_ptr (io->buf.addr), io->res, + &iter) <0 ) +return 0 ; +return ublk_copy_user_pages (req,0 , &iter, dir); }return rq_bytes; }
Signature · 1 line
2.54.0
PATCH v2 2/3 ublk: check for ublk_unmap_io() returning 0
In reply to Caleb Sander MateosIf the userspace ublk server passes an unmapped address as the data buffer for a completed ublk read, ublk_unmap_io() will return 0 indicating no bytes could be copied. Currently, this will result in calling blk_update_request() with nr_bytes=0, which doesn't seem supported. Fail the I/O with BLK_STS_IOERR in this case instead.
--- drivers/block/ublk_drv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/block/ublk_drv.c +7 -1
@@ -1588,12 +1588,18 @@ static inline void __ublk_complete_rq(struct request *req, struct ublk_io *io,/* * Extremely impossible since we got data filled in just before * * Re-read simply for this unlikely case. */ -if (unlikely (unmapped_bytes < io->res)) +if (unlikely (unmapped_bytes < io->res)) { +if (unlikely (!unmapped_bytes)) { + res =BLK_STS_IOERR ; + goto exit; + } + io->res = unmapped_bytes; + }/* * Run bio->bi_end_io() with softirqs disabled. If the final fput * happens off this path, then that will prevent ublk's blkdev_release() * from being called on current's task work, see fput() implementation.
Signature · 1 line
2.54.0
PATCH v2 3/3 ublk: remove WARN_ON_ONCE() in ublk_unmap_io()
In reply to Caleb Sander Mateosio->res is set from struct ublksrv_io_cmd's result field, which is controlled by the ublk server process, without any validation. It's thus possible for userspace to trigger the io->res > rq_bytes warning. ublk_copy_user_pages() already limits the copy length to the request data length, so drop the warning.
--- drivers/block/ublk_drv.c | 2 -- 1 file changed, 2 deletions(-)
drivers/block/ublk_drv.c +0 -2
@@ -1495,12 +1495,10 @@ static unsigned int ublk_unmap_io(bool need_map,if (ublk_need_unmap_req (req)) {struct iov_iter iter;const int dir =ITER_SOURCE ; -WARN_ON_ONCE (io->res > rq_bytes); -if (import_ubuf (dir,u64_to_user_ptr (io->buf.addr), io->res, &iter) <0 )return 0 ;return ublk_copy_user_pages (req,0 , &iter, dir);
Signature · 1 line
2.54.0
Quoted 10 lines · Caleb Sander Mateos
For ublk devices not using user copy or zero copy, the ublk driver copies request data to/from an arbitrary buffer provided by the userspace ublk server on each I/O.
Fix several bugs where the kernel driver is overly trusting of the userspace buffer. Ensure that an invalid userspace buffer at worst results in a failed or requeued I/O and can't trigger panics or undefined behavior.
[...]
Applied, thanks!
[1/3] ublk: check import_ubuf() return value
commit: 3831568792af75b6523fa93bb91560e29189cf55
[2/3] ublk: check for ublk_unmap_io() returning 0
commit: 24fd3706178f1ae5501fd1ff9036e170ed0665ba
[3/3] ublk: remove WARN_ON_ONCE() in ublk_unmap_io()
commit: 15c1339ef44054cc79c49b40b24a26aa80a2253eBest regards,
Signature · 1 line
Jens Axboe