[PATCH v2 1/2] ubi: block: fix null-pointer-dereference in ubiblock_create()

From: linan666
Date: Tue May 21 2024 - 07:22:12 EST


From: Li Nan <linan122@xxxxxxxxxx>

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.
Thus pass the variable 'gd' to dev_err() directly.

Fixes: 77567b25ab9f ("ubi: use blk_mq_alloc_disk and blk_cleanup_disk")
Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Signed-off-by: Li Nan <linan122@xxxxxxxxxx>
---
drivers/mtd/ubi/block.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index f82e3423acb9..3b61196d387b 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -390,7 +390,7 @@ int ubiblock_create(struct ubi_volume_info *vi)

ret = blk_mq_alloc_tag_set(&dev->tag_set);
if (ret) {
- dev_err(disk_to_dev(dev->gd), "blk_mq_alloc_tag_set failed");
+ dev_err(disk_to_dev(gd), "blk_mq_alloc_tag_set failed");
goto out_free_dev;
}

--
2.39.2