| Message ID | 20231116213926.2034-2-kamil.duljas@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 31e721fbd194d5723722eaa21df1d14cee7e12b5 |
| Headers | show |
| Series | [v2] ASoC: SOF: topology: Fix mem leak in sof_dai_load() | expand |
On 16/11/2023 23:39, Kamil Duljas wrote: > The function has multiple return points at which it is not released > previously allocated memory. Acked-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> > Signed-off-by: Kamil Duljas <kamil.duljas@gmail.com> > --- > Changes in v2: removed wrong usages of kfree > --- > sound/soc/sof/topology.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c > index a3a3af252259..37ec671a2d76 100644 > --- a/sound/soc/sof/topology.c > +++ b/sound/soc/sof/topology.c > @@ -1736,8 +1736,10 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index, > /* perform pcm set op */ > if (ipc_pcm_ops && ipc_pcm_ops->pcm_setup) { > ret = ipc_pcm_ops->pcm_setup(sdev, spcm); > - if (ret < 0) > + if (ret < 0) { > + kfree(spcm); > return ret; > + } > } > > dai_drv->dobj.private = spcm;
On Thu, 16 Nov 2023 22:39:17 +0100, Kamil Duljas wrote: > The function has multiple return points at which it is not released > previously allocated memory. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: topology: Fix mem leak in sof_dai_load() commit: 31e721fbd194d5723722eaa21df1d14cee7e12b5 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index a3a3af252259..37ec671a2d76 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1736,8 +1736,10 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index, /* perform pcm set op */ if (ipc_pcm_ops && ipc_pcm_ops->pcm_setup) { ret = ipc_pcm_ops->pcm_setup(sdev, spcm); - if (ret < 0) + if (ret < 0) { + kfree(spcm); return ret; + } } dai_drv->dobj.private = spcm;
The function has multiple return points at which it is not released previously allocated memory. Signed-off-by: Kamil Duljas <kamil.duljas@gmail.com> --- Changes in v2: removed wrong usages of kfree --- sound/soc/sof/topology.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)