aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHao Ge <gehao@kylinos.cn>2023-10-08 11:29:08 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-11-08 17:26:37 +0100
commit04dbfa4122e060813f9dcba31917478c013e6502 (patch)
tree54c79de8f0d122423f0ea5973e2aa94c859df072
parent0d587b86cd0d1304b6fc664707ece700058e141b (diff)
downloadaa-04dbfa4122e060813f9dcba31917478c013e6502.tar.gz
firmware/imx-dsp: Fix use_after_free in imx_dsp_setup_channels()
[ Upstream commit 1558b1a8dd388f5fcc3abc1e24de854a295044c3 ] dsp_chan->name and chan_name points to same block of memory, because dev_err still needs to be used it,so we need free it's memory after use to avoid use_after_free. Fixes: e527adfb9b7d ("firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels()") Signed-off-by: Hao Ge <gehao@kylinos.cn> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/firmware/imx/imx-dsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/imx/imx-dsp.c b/drivers/firmware/imx/imx-dsp.c
index 1f410809d3ee4b..0f656e4191d5c7 100644
--- a/drivers/firmware/imx/imx-dsp.c
+++ b/drivers/firmware/imx/imx-dsp.c
@@ -115,11 +115,11 @@ static int imx_dsp_setup_channels(struct imx_dsp_ipc *dsp_ipc)
dsp_chan->idx = i % 2;
dsp_chan->ch = mbox_request_channel_byname(cl, chan_name);
if (IS_ERR(dsp_chan->ch)) {
- kfree(dsp_chan->name);
ret = PTR_ERR(dsp_chan->ch);
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to request mbox chan %s ret %d\n",
chan_name, ret);
+ kfree(dsp_chan->name);
goto out;
}