diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-01-04 08:51:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-18 11:58:33 +0100 |
| commit | 73a630b359c852d6edc113588c513ddbcd3be47a (patch) | |
| tree | 8a98324852006f73365c408598c1ee337b88a534 /block | |
| parent | e62e6258ab140b55bbef1f0d288263b75e2f0c20 (diff) | |
| download | linux-stable-73a630b359c852d6edc113588c513ddbcd3be47a.tar.gz linux-stable-73a630b359c852d6edc113588c513ddbcd3be47a.tar.bz2 linux-stable-73a630b359c852d6edc113588c513ddbcd3be47a.zip | |
block: handle bio_split_to_limits() NULL return
commit 613b14884b8595e20b9fac4126bf627313827fbe upstream.
This can't happen right now, but in preparation for allowing
bio_split_to_limits() returning NULL if it ended the bio, check for it
in all the callers.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-merge.c | 4 | ||||
| -rw-r--r-- | block/blk-mq.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index f46c87ef951d..84f03d066cb3 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -358,11 +358,13 @@ struct bio *__bio_split_to_limits(struct bio *bio, struct queue_limits *lim, default: split = bio_split_rw(bio, lim, nr_segs, bs, get_max_io_size(bio, lim) << SECTOR_SHIFT); + if (IS_ERR(split)) + return NULL; break; } if (split) { - /* there isn't chance to merge the splitted bio */ + /* there isn't chance to merge the split bio */ split->bi_opf |= REQ_NOMERGE; blkcg_bio_issue_init(split); diff --git a/block/blk-mq.c b/block/blk-mq.c index 0b855e033a83..63abbe342b28 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2919,8 +2919,11 @@ void blk_mq_submit_bio(struct bio *bio) blk_status_t ret; bio = blk_queue_bounce(bio, q); - if (bio_may_exceed_limits(bio, &q->limits)) + if (bio_may_exceed_limits(bio, &q->limits)) { bio = __bio_split_to_limits(bio, &q->limits, &nr_segs); + if (!bio) + return; + } if (!bio_integrity_prep(bio)) return; |