mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
block: prevent an integer overflow in bvec_try_merge_hw_page
[ Upstream commit 3f034c374a
]
Reordered a check to avoid a possible overflow when adding len to bv_len.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20231204173419.782378-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
a9d12fdc51
commit
6ab391eafa
1 changed files with 1 additions and 1 deletions
|
@ -809,7 +809,7 @@ static bool bio_try_merge_hw_seg(struct request_queue *q, struct bio *bio,
|
||||||
|
|
||||||
if ((addr1 | mask) != (addr2 | mask))
|
if ((addr1 | mask) != (addr2 | mask))
|
||||||
return false;
|
return false;
|
||||||
if (bv->bv_len + len > queue_max_segment_size(q))
|
if (len > queue_max_segment_size(q) - bv->bv_len)
|
||||||
return false;
|
return false;
|
||||||
return __bio_try_merge_page(bio, page, len, offset, same_page);
|
return __bio_try_merge_page(bio, page, len, offset, same_page);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue