ubi: block: fix null-pointer-dereference in ubiblock_create()

Similar to commit adbf4c4954e3 ("ubi: block: fix memleak in
ubiblock_create()"), 'dev->gd' is not assigned but dereferenced if
blk_mq_alloc_tag_set() fails, and leading to a null-pointer-dereference.
Fix it by using pr_err() and variable 'dev' to print error log.

Additionally, the log in the error handle path of idr_alloc() has
been improved by using pr_err(), too. Before initializing device
name, using dev_err() will print error log with 'null' instead of
the actual device name, like this:
block (null): ...
~~~~~~
It is unclear. Using pr_err() can print more details of the device.
The improved log is:
ubiblock0_0: ...

Fixes: 77567b25ab9f ("ubi: use blk_mq_alloc_disk and blk_cleanup_disk")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Li Nan <linan122@huawei.com>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Richard Weinberger <richard@nod.at>

authored by

Li Nan and committed by
Richard Weinberger
4f9d406c 39986148

+4 -3
+4 -3
drivers/mtd/ubi/block.c
··· 390 390 391 391 ret = blk_mq_alloc_tag_set(&dev->tag_set); 392 392 if (ret) { 393 - dev_err(disk_to_dev(dev->gd), "blk_mq_alloc_tag_set failed"); 393 + pr_err("ubiblock%d_%d: blk_mq_alloc_tag_set failed\n", 394 + dev->ubi_num, dev->vol_id); 394 395 goto out_free_dev; 395 396 } 396 397 ··· 408 407 gd->minors = 1; 409 408 gd->first_minor = idr_alloc(&ubiblock_minor_idr, dev, 0, 0, GFP_KERNEL); 410 409 if (gd->first_minor < 0) { 411 - dev_err(disk_to_dev(gd), 412 - "block: dynamic minor allocation failed"); 410 + pr_err("ubiblock%d_%d: block: dynamic minor allocation failed\n", 411 + dev->ubi_num, dev->vol_id); 413 412 ret = -ENODEV; 414 413 goto out_cleanup_disk; 415 414 }