[PATCH] block: fix offset/size check in bio_trim()

[PATCH] block: fix offset/size check in bio_trim()

[Ming Lei]

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: e83502ca5f1e ("block: fix argument type of bio_trim()")
Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 block/bio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/bio.c b/block/bio.c
index cdd7b2915c53..7c5dcc352db6 100644
--- 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->bi_iter.bi_size >> 9))
 		return;
 
 	size <<= 9;
-- 
2.31.1

Re: [PATCH] block: fix offset/size check in bio_trim()

[Christoph Hellwig]

On Tue, Apr 12, 2022 at 10:58:14PM +0800, Ming Lei wrote:
> 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().

Just use bio_sectors() instead.

[PATCH] block: fix offset/size check in bio_trim()

[Ming Lei]

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: e83502ca5f1e ("block: fix argument type of bio_trim()")
Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
V2:
	- use bio_sectors() as suggested by Christoph

 block/bio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/bio.c b/block/bio.c
index cdd7b2915c53..4259125e16ab 100644
--- 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;
-- 
2.31.1

Re: [PATCH] block: fix offset/size check in bio_trim()

[Jens Axboe]

On Thu, 14 Apr 2022 16:44:43 +0800, Ming Lei wrote:
> 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().
> 
> 

Applied, thanks!

[1/1] block: fix offset/size check in bio_trim()
      commit: 8535c0185d14ea41f0efd6a357961b05daf6687e

Best regards,
-- 
Jens Axboe

Re: [PATCH] block: fix offset/size check in bio_trim()

[Chaitanya Kulkarni]

On 4/14/22 01:44, Ming Lei wrote:
> 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: e83502ca5f1e ("block: fix argument type of bio_trim()")
> Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
> Signed-off-by: Ming Lei <ming.lei@redhat.com>
> ---


Thanks a lot for this fix.

-ck