block: fix offset/size check in bio_trim()

Ming Lei · axboe · commit 8535c0185d14 · 2022-04-14T10:15:24.000-06:00
Unit of bio->bi_iter.bi_size is bytes, but unit of offset/size is sector. Fix the above issue in checking offset/size in bio_trim(). Fixes: e83502c ("block: fix argument type of bio_trim()") Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Signed-off-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20220414084443.1736850-1-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/block/bio.c b/block/bio.c
@@ -1598,7 +1598,7 @@ EXPORT_SYMBOL(bio_split);
 void bio_trim(struct bio *bio, sector_t offset, sector_t size)
 {
 	if (WARN_ON_ONCE(offset > BIO_MAX_SECTORS || size > BIO_MAX_SECTORS ||
-			 offset + size > bio->bi_iter.bi_size))
+			 offset + size > bio_sectors(bio)))
 		return;
 
 	size <<= 9;

Original file line number	Diff line number	Diff line change
`@@ -1598,7 +1598,7 @@ EXPORT_SYMBOL(bio_split);`
`1598`	`1598`	`void bio_trim(struct bio *bio, sector_t offset, sector_t size)`
`1599`	`1599`	`{`
`1600`	`1600`	`if (WARN_ON_ONCE(offset > BIO_MAX_SECTORS \|\| size > BIO_MAX_SECTORS \|\|`
`1601`		`- offset + size > bio->bi_iter.bi_size))`
	`1601`	`+ offset + size > bio_sectors(bio)))`
`1602`	`1602`	`return;`
`1603`	`1603`
`1604`	`1604`	`size <<= 9;`