iter revert problems
Subsystems (3)
v3 cover iter revert problems
iov_iter_revert() doesn't go well with iov_iter_truncate() in all cases, see 2/2 for the bug description. As mentioned there the current problems is because of generic_write_checks(), but there was also a similar case fixed in 5.12, which should have been triggerable by normal write(2)/read(2) and others.
It may be better to enforce reexpands as a long term solution, but for now this patchset is quickier and easier to backport.
v2: don't fail if it was justly fully reverted
v3: use truncated size + reexapand based approach
Pavel Begunkov (2):
iov_iter: track truncated size
io_uring: reexpand under-reexpanded iters
fs/io_uring.c | 2 ++ include/linux/uio.h | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-)
Signature · 1 line
2.32.0
PATCH v3 1/2 iov_iter: track truncated size
Remember how many bytes were truncated and reverted back. Because not reexpanded iterators don't always work well with reverting, we may need to know that to reexpand ourselves when needed.
--- include/linux/uio.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/linux/uio.h +5 -1
@@ -47,6 +47,7 @@ struct iov_iter { };loff_t xarray_start; }; +size_t truncated; };static inline enum iter_type iov_iter_type (const struct iov_iter *i)
@@ -254,8 +255,10 @@ static inline void iov_iter_truncate(struct iov_iter *i, u64 count)* conversion in assignement is by definition greater than all * values of size_t, including old i->count. */ -if (i->count > count) +if (i->count > count) { + i->truncated += i->count - count; i->count = count; + } }/*
@@ -264,6 +267,7 @@ static inline void iov_iter_truncate(struct iov_iter *i, u64 count)*/ static inline void iov_iter_reexpand (struct iov_iter *i,size_t count) { + i->truncated -= count - i->count; i->count = count; }
Signature · 1 line
2.32.0
PATCH v3 2/2 io_uring: reexpand under-reexpanded iters
In reply to Pavel Begunkov[ 74.211232] BUG: KASAN: stack-out-of-bounds in iov_iter_revert+0x809/0x900 [ 74.212778] Read of size 8 at addr ffff888025dc78b8 by task syz-executor.0/828 [ 74.214756] CPU: 0 PID: 828 Comm: syz-executor.0 Not tainted 5.14.0-rc3-next-20210730 #1 [ 74.216525] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 [ 74.219033] Call Trace: [ 74.219683] dump_stack_lvl+0x8b/0xb3 [ 74.220706] print_address_description.constprop.0+0x1f/0x140 [ 74.224226] kasan_report.cold+0x7f/0x11b [ 74.226085] iov_iter_revert+0x809/0x900 [ 74.227960] io_write+0x57d/0xe40 [ 74.232647] io_issue_sqe+0x4da/0x6a80 [ 74.242578] __io_queue_sqe+0x1ac/0xe60 [ 74.245358] io_submit_sqes+0x3f6e/0x76a0 [ 74.248207] __do_sys_io_uring_enter+0x90c/0x1a20 [ 74.257167] do_syscall_64+0x3b/0x90 [ 74.257984] entry_SYSCALL_64_after_hwframe+0x44/0xae
old_size = iov_iter_count();
...iov_iter_revert(old_size - iov_iter_count());
If iov_iter_revert() is done base on the initial size as above, and the iter is truncated and not reexpanded in the middle, it miscalculates borders causing problems. This trace is due to no one reexpanding after generic_write_checks().
Now iters store how many bytes has been truncated, so reexpand them to the initial state right before reverting.
--- fs/io_uring.c | 2 ++ 1 file changed, 2 insertions(+)
fs/io_uring.c +2 -0
@@ -3323,6 +3323,7 @@ static int io_read(struct io_kiocb *req, unsigned int issue_flags)if (req->flags &REQ_F_NOWAIT ) goto done;/* some cases will consume bytes even on error returns */ +iov_iter_reexpand (iter, iter->count + iter->truncated);iov_iter_revert (iter, io_size -iov_iter_count (iter)); ret =0 ; }else if (ret == -EIOCBQUEUED ) {
@@ -3462,6 +3463,7 @@ static int io_write(struct io_kiocb *req, unsigned int issue_flags) }else { copy_iov:/* some cases will consume bytes even on error returns */ +iov_iter_reexpand (iter, iter->count + iter->truncated);iov_iter_revert (iter, io_size -iov_iter_count (iter)); ret =io_setup_async_rw (req, iovec, inline_vecs, iter, false);return ret ?: -EAGAIN ;
Signature · 1 line
2.32.0
Quoted 8 lines · Pavel Begunkov
iov_iter_revert()doesn't go well withiov_iter_truncate()in all cases, see 2/2 for the bug description. As mentioned there the current problems is because ofgeneric_write_checks(), but there was also a similar case fixed in 5.12, which should have been triggerable by normal write(2)/read(2) and others.It may be better to enforce reexpands as a long term solution, but for now this patchset is quickier and easier to backport.
Al, given the discussion from this weekend, are you fine with the first patch? If so, would be great with an ack/review. Or, if you want to funnel this for 5.14, you can add:
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerQuoted 11 lines · Pavel Begunkov
iov_iter_revert()doesn't go well withiov_iter_truncate()in all cases, see 2/2 for the bug description. As mentioned there the current problems is because ofgeneric_write_checks(), but there was also a similar case fixed in 5.12, which should have been triggerable by normal write(2)/read(2) and others.It may be better to enforce reexpands as a long term solution, but for now this patchset is quickier and easier to backport.
v2: don't fail if it was justly fully reverted
v3: use truncated size + reexapand based approach
Al, let's get this upstream. How do you want to handle it? I can take it through the io_uring tree, or it can go through your tree. I really don't care which route it takes, but we should get this upstream as it solves a real problem.
Signature · 1 line
Jens Axboe
Al Viro
maintainerQuoted 10 lines · Jens Axboe
Quoted 9 lines · Pavel Begunkov
iov_iter_revert()doesn't go well withiov_iter_truncate()in all cases, see 2/2 for the bug description. As mentioned there the current problems is because ofgeneric_write_checks(), but there was also a similar case fixed in 5.12, which should have been triggerable by normal write(2)/read(2) and others.It may be better to enforce reexpands as a long term solution, but for now this patchset is quickier and easier to backport.
Quoted 7 lines
Quoted 2 lines
v2: don't fail if it was justly fully reverted
v3: use truncated size + reexapand based approachAl, let's get this upstream. How do you want to handle it? I can take it through the
io_uringtree, or it can go through your tree. I really don't care which route it takes, but we should get this upstream as it solves a real problem.
Grabbed, will test and send a pull request...
Jens Axboe
maintainerQuoted 14 lines · Al Viro
Quoted 13 lines · Jens Axboe
Quoted 11 lines · Pavel Begunkov
iov_iter_revert()doesn't go well withiov_iter_truncate()in all cases, see 2/2 for the bug description. As mentioned there the current problems is because ofgeneric_write_checks(), but there was also a similar case fixed in 5.12, which should have been triggerable by normal write(2)/read(2) and others.It may be better to enforce reexpands as a long term solution, but for now this patchset is quickier and easier to backport.
v2: don't fail if it was justly fully reverted
v3: use truncated size + reexapand based approach
Quoted 6 lines
Quoted 4 lines
Al, let's get this upstream. How do you want to handle it? I can take it through the
io_uringtree, or it can go through your tree. I really don't care which route it takes, but we should get this upstream as it solves a real problem.Grabbed, will test and send a pull request...
Thanks Al! We should mark these for stable as well.
Signature · 1 line
Jens Axboe