Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

+3 -2
+3 -2
block/fops.c
··· 783 783 file_accessed(iocb->ki_filp); 784 784 785 785 ret = blkdev_direct_IO(iocb, to); 786 - if (ret >= 0) { 786 + if (ret > 0) { 787 787 iocb->ki_pos += ret; 788 788 count -= ret; 789 789 } 790 - iov_iter_revert(to, count - iov_iter_count(to)); 790 + if (ret != -EIOCBQUEUED) 791 + iov_iter_revert(to, count - iov_iter_count(to)); 791 792 if (ret < 0 || !count) 792 793 goto reexpand; 793 794 }