diff options
author | Bernd Schubert <bernd.schubert@itwm.fraunhofer.de> | 2012-05-11 10:36:44 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-05-11 10:45:12 -0400 |
commit | f908ee9463b09ddd05e1c1a0111132212dc05fac (patch) | |
tree | af80b227ec2049aa23fc3a8867e70fd685a4d34a | |
parent | 080399aaaf3531f5b8761ec0ac30ff98891e8686 (diff) |
bio allocation failure due to bio_get_nr_vecs()
The number of bio_get_nr_vecs() is passed down via bio_alloc() to
bvec_alloc_bs(), which fails the bio allocation if
nr_iovecs > BIO_MAX_PAGES. For the underlying caller this causes an
unexpected bio allocation failure.
Limiting to queue_max_segments() is not sufficient, as max_segments
also might be very large.
bvec_alloc_bs(gfp_mask, nr_iovecs, ) => NULL when nr_iovecs > BIO_MAX_PAGES
bio_alloc_bioset(gfp_mask, nr_iovecs, ...)
bio_alloc(GFP_NOIO, nvecs)
xfs_alloc_ioend_bio()
Signed-off-by: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
Cc: stable@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r-- | fs/bio.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -505,9 +505,14 @@ EXPORT_SYMBOL(bio_clone); | |||
505 | int bio_get_nr_vecs(struct block_device *bdev) | 505 | int bio_get_nr_vecs(struct block_device *bdev) |
506 | { | 506 | { |
507 | struct request_queue *q = bdev_get_queue(bdev); | 507 | struct request_queue *q = bdev_get_queue(bdev); |
508 | return min_t(unsigned, | 508 | int nr_pages; |
509 | |||
510 | nr_pages = min_t(unsigned, | ||
509 | queue_max_segments(q), | 511 | queue_max_segments(q), |
510 | queue_max_sectors(q) / (PAGE_SIZE >> 9) + 1); | 512 | queue_max_sectors(q) / (PAGE_SIZE >> 9) + 1); |
513 | |||
514 | return min_t(unsigned, nr_pages, BIO_MAX_PAGES); | ||
515 | |||
511 | } | 516 | } |
512 | EXPORT_SYMBOL(bio_get_nr_vecs); | 517 | EXPORT_SYMBOL(bio_get_nr_vecs); |
513 | 518 | ||