| Message ID | 20221122091856.47606-1-jiasheng@iscas.ac.cn |
|---|---|
| State | New |
| Headers | show |
| Series | memstick/ms_block: Add check for alloc_ordered_workqueue | expand |
On Tue, 22 Nov 2022 at 10:19, Jiasheng Jiang <jiasheng@iscas.ac.cn> wrote: > > As the alloc_ordered_workqueue may return NULL pointer, > it should be better to add check for the return > value. > > Fixes: 0ab30494bc4f ("memstick: add support for legacy memorysticks") > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> Applied for next, thanks! Kind regards Uffe > --- > drivers/memstick/core/ms_block.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c > index ba8414519515..ccfdb3dea30a 100644 > --- a/drivers/memstick/core/ms_block.c > +++ b/drivers/memstick/core/ms_block.c > @@ -2116,6 +2116,9 @@ static int msb_init_disk(struct memstick_dev *card) > dbg("Set total disk size to %lu sectors", capacity); > > msb->io_queue = alloc_ordered_workqueue("ms_block", WQ_MEM_RECLAIM); > + if (!msb->io_queue) > + goto out_cleanup_disk; > + > INIT_WORK(&msb->io_work, msb_io_work); > sg_init_table(msb->prealloc_sg, MS_BLOCK_MAX_SEGS+1); > > -- > 2.25.1 >
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index ba8414519515..ccfdb3dea30a 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -2116,6 +2116,9 @@ static int msb_init_disk(struct memstick_dev *card) dbg("Set total disk size to %lu sectors", capacity); msb->io_queue = alloc_ordered_workqueue("ms_block", WQ_MEM_RECLAIM); + if (!msb->io_queue) + goto out_cleanup_disk; + INIT_WORK(&msb->io_work, msb_io_work); sg_init_table(msb->prealloc_sg, MS_BLOCK_MAX_SEGS+1);
As the alloc_ordered_workqueue may return NULL pointer, it should be better to add check for the return value. Fixes: 0ab30494bc4f ("memstick: add support for legacy memorysticks") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> --- drivers/memstick/core/ms_block.c | 3 +++ 1 file changed, 3 insertions(+)