diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-12-04 18:34:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-23 08:54:44 +0100 |
| commit | 6ab391eafa43d39010f5b8209644747bd2444b53 (patch) | |
| tree | 72eb7c9e202594c8693ee568fbebb3b893089cec /block | |
| parent | a9d12fdc5192f1baa927078e3f5864b95b665eab (diff) | |
| download | linux-6ab391eafa43d39010f5b8209644747bd2444b53.tar.gz linux-6ab391eafa43d39010f5b8209644747bd2444b53.tar.bz2 linux-6ab391eafa43d39010f5b8209644747bd2444b53.zip | |
block: prevent an integer overflow in bvec_try_merge_hw_page
[ Upstream commit 3f034c374ad55773c12dd8f3c1607328e17c0072 ]
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>
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 a0080dc55c95..92399883bc5e 100644 --- a/block/bio.c +++ b/block/bio.c @@ -809,7 +809,7 @@ static bool bio_try_merge_hw_seg(struct request_queue *q, struct bio *bio, if ((addr1 | mask) != (addr2 | mask)) 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 __bio_try_merge_page(bio, page, len, offset, same_page); } |