moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memstick/ms_block: Add check for alloc_ordered_workqueue

Browse Source 
[ Upstream commit 4f431a047a5c8698ed4b67e2760cfbeb5fffb69d ]

As the alloc_ordered_workqueue may return NULL pointer, it should be better
to add check for the return value. Moreover, the msb->io_queue should be
freed if error occurs later.

Fixes: 0ab30494bc ("memstick: add support for legacy memorysticks")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20221126012558.34374-1-jiasheng@iscas.ac.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jiasheng Jiang
2022-11-26 09:25:58 +08:00
committed by Greg Kroah-Hartman
parent b77ced3fce
commit 7fecca429e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/memstick/core/ms_block.c
View File

@@ -2150,6 +2150,11 @@ static int msb_init_disk(struct memstick_dev *card)
msb->usage_count = 1; msb->usage_count = 1;
msb->io_queue = alloc_ordered_workqueue("ms_block", WQ_MEM_RECLAIM); msb->io_queue = alloc_ordered_workqueue("ms_block", WQ_MEM_RECLAIM);
if (!msb->io_queue) {
rc = -ENOMEM;
goto out_cleanup_disk;
}
INIT_WORK(&msb->io_work, msb_io_work); INIT_WORK(&msb->io_work, msb_io_work);
sg_init_table(msb->prealloc_sg, MS_BLOCK_MAX_SEGS+1); sg_init_table(msb->prealloc_sg, MS_BLOCK_MAX_SEGS+1);
@@ -2159,10 +2164,12 @@ static int msb_init_disk(struct memstick_dev *card)
msb_start(card); msb_start(card);
rc = device_add_disk(&card->dev, msb->disk, NULL); rc = device_add_disk(&card->dev, msb->disk, NULL);
if (rc) if (rc)
goto out_cleanup_disk; goto out_destroy_workqueue;
dbg("Disk added"); dbg("Disk added");
return 0; return 0;
out_destroy_workqueue:
destroy_workqueue(msb->io_queue);
out_cleanup_disk: out_cleanup_disk:
blk_cleanup_disk(msb->disk); blk_cleanup_disk(msb->disk);
out_free_tag_set: out_free_tag_set: