diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-01-23 06:18:41 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-17 09:40:25 +0100 |
| commit | 84671b0630ccb46ae9f1f99a45c7d63ffcd6a474 (patch) | |
| tree | 3c8d275e33b5e35eb43af0e9645b59eb88c39fa3 /block | |
| parent | 0b0c4d1de598a70c033ba21fdc55e3be8799c8fe (diff) | |
| download | linux-84671b0630ccb46ae9f1f99a45c7d63ffcd6a474.tar.gz linux-84671b0630ccb46ae9f1f99a45c7d63ffcd6a474.tar.bz2 linux-84671b0630ccb46ae9f1f99a45c7d63ffcd6a474.zip | |
block: don't revert iter for -EIOCBQUEUED
commit b13ee668e8280ca5b07f8ce2846b9957a8a10853 upstream.
blkdev_read_iter() has a few odd checks, like gating the position and
count adjustment on whether or not the result is bigger-than-or-equal to
zero (where bigger than makes more sense), and not checking the return
value of blkdev_direct_IO() before doing an iov_iter_revert(). The
latter can lead to attempting to revert with a negative value, which
when passed to iov_iter_revert() as an unsigned value will lead to
throwing a WARN_ON() because unroll is bigger than MAX_RW_COUNT.
Be sane and don't revert for -EIOCBQUEUED, like what is done in other
spots.
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/fops.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/fops.c b/block/fops.c index 1df187b30679..7c257eb3564d 100644 --- a/block/fops.c +++ b/block/fops.c @@ -718,11 +718,12 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to) file_accessed(iocb->ki_filp); ret = blkdev_direct_IO(iocb, to); - if (ret >= 0) { + if (ret > 0) { iocb->ki_pos += ret; count -= ret; } - iov_iter_revert(to, count - iov_iter_count(to)); + if (ret != -EIOCBQUEUED) + iov_iter_revert(to, count - iov_iter_count(to)); if (ret < 0 || !count) goto reexpand; } |