diff options
| author |   Colin Ian King <colin.king@canonical.com> | 2021-06-02 11:06:59 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-06-03 09:54:33 -0600 |
| commit | 90bf3e28ef51aa3f480d2f2151813be669ba69ce (patch) | |
| tree | 3a9c1343dc69b41ce8b683674310cca850ec9b4f /drivers | |
| parent | block: remove bdget_disk (diff) | |
| download | linux-dev-90bf3e28ef51aa3f480d2f2151813be669ba69ce.tar.xz linux-dev-90bf3e28ef51aa3f480d2f2151813be669ba69ce.zip | |
null_blk: Fix null pointer dereference on nullb->disk on blk_cleanup_disk call
The error handling on a nullb->disk allocation currently jumps to
out_cleanup_disk that calls blk_cleanup_disk with a null pointer causing
a null pointer dereference issue. Fix this by jumping to out_cleanup_tags
instead.
Addresses-Coverity: ("Dereference after null check")
Fixes: 132226b301b5 ("null_blk: convert to blk_alloc_disk/blk_cleanup_disk")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210602100659.11058-1-colin.king@canonical.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/null_blk/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index d8e098f1e5b5..83d803cb57c8 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -1856,7 +1856,7 @@ static int null_add_dev(struct nullb_device *dev) goto out_cleanup_tags; nullb->disk = alloc_disk_node(1, nullb->dev->home_node); if (!nullb->disk) - goto out_cleanup_disk; + goto out_cleanup_tags; nullb->disk->queue = nullb->q; } else if (dev->queue_mode == NULL_Q_BIO) { rv = -ENOMEM; |