tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

block: prevent an integer overflow in bvec_try_merge_hw_page

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>

authored by

Christoph Hellwig and committed by
Jens Axboe 3f034c37 f19d1e3b

+1 -1
+1 -1
block/bio.c
··· 944 944 945 945 if ((addr1 | mask) != (addr2 | mask)) 946 946 return false; 947 - if (bv->bv_len + len > queue_max_segment_size(q)) 947 + if (len > queue_max_segment_size(q) - bv->bv_len) 948 948 return false; 949 949 return bvec_try_merge_page(bv, page, len, offset, same_page); 950 950 }