| Message ID | 20240503081042.2078062-1-hch@lst.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | block: refine the EOF check in blkdev_iomap_begin | expand |
On Fri, 03 May 2024 10:10:42 +0200, Christoph Hellwig wrote: > blkdev_iomap_begin rounds down the offset to the logical block size > before stashing it in iomap->offset and checking that it still is > inside the inode size. > > Check the i_size check to the raw pos value so that we don't try a > zero size write if iter->pos is unaligned. > > [...] Applied, thanks! [1/1] block: refine the EOF check in blkdev_iomap_begin commit: 0c12028aec837f5a002009bbf68d179d506510e8 Best regards,
diff --git a/block/fops.c b/block/fops.c index 679d9b752fe828..df2c68d3f198e1 100644 --- a/block/fops.c +++ b/block/fops.c @@ -390,7 +390,7 @@ static int blkdev_iomap_begin(struct inode *inode, loff_t offset, loff_t length, iomap->bdev = bdev; iomap->offset = ALIGN_DOWN(offset, bdev_logical_block_size(bdev)); - if (iomap->offset >= isize) + if (offset >= isize) return -EIO; iomap->type = IOMAP_MAPPED; iomap->addr = iomap->offset;
blkdev_iomap_begin rounds down the offset to the logical block size before stashing it in iomap->offset and checking that it still is inside the inode size. Check the i_size check to the raw pos value so that we don't try a zero size write if iter->pos is unaligned. Fixes: 487c607df790 ("block: use iomap for writes to block devices") Reported-by: syzbot+0a3683a0a6fecf909244@syzkaller.appspotmail.com Signed-off-by: Christoph Hellwig <hch@lst.de> Tested-by: syzbot+0a3683a0a6fecf909244@syzkaller.appspotmail.com --- block/fops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)