Skip to contentSkip to conversation

block: refine the EOF check in blkdev_iomap_begin

PATCH Applied Christoph Hellwig 2 participants 2 messages May 3, 2024 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block: refine the EOF check in blkdev_iomap_begin

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 [email protected]
---
 block/fops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/fops.c +1 -1
index 679d9b752fe828..df2c68d3f198e1 100644
@@ -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;
Signature · 1 line
2.39.2
maintainer Applied
#1 lore raw
Quoted 8 lines · Christoph Hellwig

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,

Signature · 1 line
Jens Axboe