null_blk: Cleanup error recovery in null_add_dev()
PATCH 1/1 null_blk: Cleanup error recovery in null_add_dev()
When creation of queues fails in init_driver_queues(), we free the queues. But null_add_dev() doesn't test for this failure and continues with the setup leading to strange consequences, likely oops. Fix the problem by testing whether init_driver_queues() failed and do proper error cleanup.
Coverity-id: 1148005
Signed-off-by Jan Kara <[email protected]>
--- drivers/block/null_blk.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/block/null_blk.c +7 -7
@@ -450,14 +450,10 @@ static int init_driver_queues(struct nullb *nullb) ret =setup_commands (nq);if (ret) - goto err_queue; +return ret; nullb->nr_queues++; } -return 0 ; -err_queue: -cleanup_queues (nullb); -return ret; }static int null_add_dev (void )
@@ -507,7 +503,9 @@ static int null_add_dev(void) goto out_cleanup_queues; }blk_queue_make_request (nullb->q, null_queue_bio); -init_driver_queues (nullb); + rv =init_driver_queues (nullb); +if (rv) + goto out_cleanup_blk_queue; }else { nullb->q =blk_init_queue_node (null_request_fn, &nullb->lock, home_node);if (!nullb->q) {
@@ -516,7 +514,9 @@ static int null_add_dev(void) }blk_queue_prep_rq (nullb->q, null_rq_prep_fn);blk_queue_softirq_done (nullb->q, null_softirq_done_fn); -init_driver_queues (nullb); + rv =init_driver_queues (nullb); +if (rv) + goto out_cleanup_blk_queue; } nullb->q->queuedata = nullb;
Signature · 1 line
1.8.1.4
Jens Axboe
maintainerQuoted 5 lines · Jan Kara
When creation of queues fails in
init_driver_queues(), we free the queues. Butnull_add_dev()doesn't test for this failure and continues with the setup leading to strange consequences, likely oops. Fix the problem by testing whetherinit_driver_queues()failed and do proper error cleanup.
Thanks Jan, applied.
Signature · 1 line
Jens Axboe