Skip to content

Commit 9d237cb

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: stable@vger.kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0dc51e1 commit 9d237cb

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
@@ -758,11 +758,12 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to)
758758
file_accessed(iocb->ki_filp);
759759

760760
ret = blkdev_direct_IO(iocb, to);
761-
if (ret >= 0) {
761+
if (ret > 0) {
762762
iocb->ki_pos += ret;
763763
count -= ret;
764764
}
765-
iov_iter_revert(to, count - iov_iter_count(to));
765+
if (ret != -EIOCBQUEUED)
766+
iov_iter_revert(to, count - iov_iter_count(to));
766767
if (ret < 0 || !count)
767768
goto reexpand;
768769
}

0 commit comments

Comments
 (0)