2023-01-15 19:08:38

by Christophe JAILLET

[permalink] [raw]
Subject: [PATCH] firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels()

If mbox_request_channel_byname() fails, the memory allocated a few lines
above still need to be freed before going to the error handling path.

Fixes: 046326989a18 ("firmware: imx: Save channel name for further use")
Signed-off-by: Christophe JAILLET <[email protected]>
---
The Fixes tag is not really accurate, the issue was already there before,
with other emory leaks.
However, I think that the Fixes tag above is much more logical.

Feel free to update!
---
drivers/firmware/imx/imx-dsp.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/firmware/imx/imx-dsp.c b/drivers/firmware/imx/imx-dsp.c
index a6c06d7476c3..1f410809d3ee 100644
--- a/drivers/firmware/imx/imx-dsp.c
+++ b/drivers/firmware/imx/imx-dsp.c
@@ -115,6 +115,7 @@ 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",
--
2.34.1


2023-01-17 08:15:46

by Daniel Baluta

[permalink] [raw]
Subject: Re: [PATCH] firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels()

On Sun, Jan 15, 2023 at 8:35 PM Christophe JAILLET
<[email protected]> wrote:
>
> If mbox_request_channel_byname() fails, the memory allocated a few lines
> above still need to be freed before going to the error handling path.
>
> Fixes: 046326989a18 ("firmware: imx: Save channel name for further use")
> Signed-off-by: Christophe JAILLET <[email protected]>

Good catch.

Reviewed-by: Daniel Baluta <[email protected]>

2023-09-19 12:23:57

by Shawn Guo

[permalink] [raw]
Subject: Re: [PATCH] firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels()

On Sun, Aug 20, 2023 at 08:26:01AM +0200, Christophe JAILLET wrote:
> Le 17/01/2023 ? 08:55, Daniel Baluta a ?crit?:
> > On Sun, Jan 15, 2023 at 8:35 PM Christophe JAILLET
> > <[email protected]> wrote:
> > >
> > > If mbox_request_channel_byname() fails, the memory allocated a few lines
> > > above still need to be freed before going to the error handling path.
> > >
> > > Fixes: 046326989a18 ("firmware: imx: Save channel name for further use")
> > > Signed-off-by: Christophe JAILLET <[email protected]>
> >
> > Good catch.
> >
> > Reviewed-by: Daniel Baluta <[email protected]>
> >
>
> Hi,
>
> polite reminder.
>
> This patch is still not in -next.

Sorry, not sure how this fell from the crack.

Applied, thanks!