Commit 8535c018 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: fix offset/size check in bio_trim() 



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: e83502ca ("block: fix argument type of bio_trim()")
Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20220414084443.1736850-1-ming.lei@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b9768752

block/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -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;