| Message ID | 20231116125150.1436-1-kamil.duljas@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d5c65be34df73fa01ed05611aafb73b440d89e29 |
| Headers | show |
| Series | ASoC: Intel: Skylake: Fix mem leak in few functions | expand |
On 11/16/2023 1:51 PM, Kamil Duljas wrote: > The resources should be freed when function return error. > > Signed-off-by: Kamil Duljas <kamil.duljas@gmail.com> > --- > sound/soc/intel/skylake/skl-pcm.c | 4 +++- > sound/soc/intel/skylake/skl-sst-ipc.c | 4 +++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c > index d0c02e8a6785..18866bc415a5 100644 > --- a/sound/soc/intel/skylake/skl-pcm.c > +++ b/sound/soc/intel/skylake/skl-pcm.c > @@ -240,8 +240,10 @@ static int skl_pcm_open(struct snd_pcm_substream *substream, > snd_pcm_set_sync(substream); > > mconfig = skl_tplg_fe_get_cpr_module(dai, substream->stream); > - if (!mconfig) > + if (!mconfig) { > + kfree(dma_params); > return -EINVAL; > + } > > skl_tplg_d0i3_get(skl, mconfig->d0i3_caps); > > diff --git a/sound/soc/intel/skylake/skl-sst-ipc.c b/sound/soc/intel/skylake/skl-sst-ipc.c > index 7a425271b08b..fd9624ad5f72 100644 > --- a/sound/soc/intel/skylake/skl-sst-ipc.c > +++ b/sound/soc/intel/skylake/skl-sst-ipc.c > @@ -1003,8 +1003,10 @@ int skl_ipc_get_large_config(struct sst_generic_ipc *ipc, > > reply.size = (reply.header >> 32) & IPC_DATA_OFFSET_SZ_MASK; > buf = krealloc(reply.data, reply.size, GFP_KERNEL); > - if (!buf) > + if (!buf) { > + kfree(reply.data); > return -ENOMEM; > + } > *payload = buf; > *bytes = reply.size; > Seems ok, Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
On Thu, 16 Nov 2023 13:51:50 +0100, Kamil Duljas wrote: > The resources should be freed when function return error. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: Intel: Skylake: Fix mem leak in few functions commit: d5c65be34df73fa01ed05611aafb73b440d89e29 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/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index d0c02e8a6785..18866bc415a5 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -240,8 +240,10 @@ static int skl_pcm_open(struct snd_pcm_substream *substream, snd_pcm_set_sync(substream); mconfig = skl_tplg_fe_get_cpr_module(dai, substream->stream); - if (!mconfig) + if (!mconfig) { + kfree(dma_params); return -EINVAL; + } skl_tplg_d0i3_get(skl, mconfig->d0i3_caps); diff --git a/sound/soc/intel/skylake/skl-sst-ipc.c b/sound/soc/intel/skylake/skl-sst-ipc.c index 7a425271b08b..fd9624ad5f72 100644 --- a/sound/soc/intel/skylake/skl-sst-ipc.c +++ b/sound/soc/intel/skylake/skl-sst-ipc.c @@ -1003,8 +1003,10 @@ int skl_ipc_get_large_config(struct sst_generic_ipc *ipc, reply.size = (reply.header >> 32) & IPC_DATA_OFFSET_SZ_MASK; buf = krealloc(reply.data, reply.size, GFP_KERNEL); - if (!buf) + if (!buf) { + kfree(reply.data); return -ENOMEM; + } *payload = buf; *bytes = reply.size;
The resources should be freed when function return error. Signed-off-by: Kamil Duljas <kamil.duljas@gmail.com> --- sound/soc/intel/skylake/skl-pcm.c | 4 +++- sound/soc/intel/skylake/skl-sst-ipc.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)