diff options
| author | Ming Lei <ming.lei@redhat.com> | 2022-04-14 16:44:43 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-20 09:34:14 +0200 |
| commit | 3e67054c339c9a636d228cb9b0aac5c1c667a99c (patch) | |
| tree | 0d86b779d5f6263c1a3e37932c38de4c9f114d28 /block | |
| parent | 279018a01b086353ad71c039bb7a70e99f2260f0 (diff) | |
| download | linux-stable-3e67054c339c9a636d228cb9b0aac5c1c667a99c.tar.gz linux-stable-3e67054c339c9a636d228cb9b0aac5c1c667a99c.tar.bz2 linux-stable-3e67054c339c9a636d228cb9b0aac5c1c667a99c.zip | |
block: fix offset/size check in bio_trim()
[ Upstream commit 8535c0185d14ea41f0efd6a357961b05daf6687e ]
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>
Link: https://lore.kernel.org/r/20220414084443.1736850-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bio.c b/block/bio.c index 25f1ed261100..8906c9856a7d 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1552,7 +1552,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; |