Skip to content

Commit b13ee66

Browse files
committed
block: don't revert iter for -EIOCBQUEUED
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>
1 parent 7004a2e commit b13ee66

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

block/fops.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,11 +783,12 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to)
783783
file_accessed(iocb->ki_filp);
784784

785785
ret = blkdev_direct_IO(iocb, to);
786-
if (ret >= 0) {
786+
if (ret > 0) {
787787
iocb->ki_pos += ret;
788788
count -= ret;
789789
}
790-
iov_iter_revert(to, count - iov_iter_count(to));
790+
if (ret != -EIOCBQUEUED)
791+
iov_iter_revert(to, count - iov_iter_count(to));
791792
if (ret < 0 || !count)
792793
goto reexpand;
793794
}

0 commit comments

Comments
 (0)