projects/linux·commit 596f138e

dm io: fix panic on large request

596f138e · Jun'ichi Nomura <[email protected]> · 2007-07-12 17:27:45 +01:00

bio_alloc_bioset() will return NULL if 'num_vecs' is too large.
Use bio_get_nr_vecs() to get estimation of maximum number.

Cc: [email protected]
Signed-off-by: "Jun'ichi Nomura" <[email protected]>
Signed-off-by: Alasdair G Kergon <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
596f138eede0c113aa655937c8be85fc15ccd61c
Parents
c95bc206

Changes

1 files changed · +4 −1

FileStatusAddDelContent
drivers/md/dm-io.cmodified+4−1View file

drivers/md/dm-io.c

View file
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index 352c6fb..f3a7724 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -293,7 +293,10 @@ static void do_region(int rw, unsigned int region, struct io_region *where,
* bvec for bio_get/set_region() and decrement bi_max_vecs
* to hide it from bio_add_page().
*/
- num_bvecs = (remaining / (PAGE_SIZE >> SECTOR_SHIFT)) + 2;
+ num_bvecs = dm_sector_div_up(remaining,
+ (PAGE_SIZE >> SECTOR_SHIFT));
+ num_bvecs = 1 + min_t(int, bio_get_nr_vecs(where->bdev),
+ num_bvecs);
bio = bio_alloc_bioset(GFP_NOIO, num_bvecs, io->client->bios);
bio->bi_sector = where->sector + (where->count - remaining);
bio->bi_bdev = where->bdev;