Commit 63e8b94a authored by Dinghao Liu's avatar Dinghao Liu Committed by Vasily Gorbik

s390/cio: fix a memleak in css_alloc_subchannel

When dma_set_coherent_mask() fails, sch->lock has not been
freed, which is allocated in css_sch_create_locks(), leading
to a memleak.

Fixes: 4520a91a ("s390/cio: use dma helpers for setting masks")
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Message-Id: <20230921071412.13806-1-dinghao.liu@zju.edu.cn>
Link: https://lore.kernel.org/linux-s390/bd38baa8-7b9d-4d89-9422-7e943d626d6e@linux.ibm.com/Reviewed-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 5c95bf27
...@@ -233,17 +233,19 @@ struct subchannel *css_alloc_subchannel(struct subchannel_id schid, ...@@ -233,17 +233,19 @@ struct subchannel *css_alloc_subchannel(struct subchannel_id schid,
*/ */
ret = dma_set_coherent_mask(&sch->dev, DMA_BIT_MASK(31)); ret = dma_set_coherent_mask(&sch->dev, DMA_BIT_MASK(31));
if (ret) if (ret)
goto err; goto err_lock;
/* /*
* But we don't have such restrictions imposed on the stuff that * But we don't have such restrictions imposed on the stuff that
* is handled by the streaming API. * is handled by the streaming API.
*/ */
ret = dma_set_mask(&sch->dev, DMA_BIT_MASK(64)); ret = dma_set_mask(&sch->dev, DMA_BIT_MASK(64));
if (ret) if (ret)
goto err; goto err_lock;
return sch; return sch;
err_lock:
kfree(sch->lock);
err: err:
kfree(sch); kfree(sch);
return ERR_PTR(ret); return ERR_PTR(ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment