Skip to content

Commit 84671b0

Browse files
axboegregkh
authored andcommitted
block: don't revert iter for -EIOCBQUEUED
commit b13ee66 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: [email protected] Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0b0c4d1 commit 84671b0

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

block/fops.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -718,11 +718,12 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to)
718718
file_accessed(iocb->ki_filp);
719719

720720
ret = blkdev_direct_IO(iocb, to);
721-
if (ret >= 0) {
721+
if (ret > 0) {
722722
iocb->ki_pos += ret;
723723
count -= ret;
724724
}
725-
iov_iter_revert(to, count - iov_iter_count(to));
725+
if (ret != -EIOCBQUEUED)
726+
iov_iter_revert(to, count - iov_iter_count(to));
726727
if (ret < 0 || !count)
727728
goto reexpand;
728729
}

0 commit comments

Comments
 (0)