samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "asoc: free backend_name memory when error happens"

Browse Source
This commit is contained in:
qctecmdr
2022-11-22 07:09:17 -08:00
committed by Gerrit - the friendly Code Review server
parent 34e547a74b 17e29ced12
commit fee63bd4ec
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
asoc/msm_common.c
View File

@@ -1121,16 +1121,20 @@ int msm_common_dai_link_init(struct snd_soc_pcm_runtime *rtd)
} }
pdata = devm_kzalloc(dev, sizeof(struct chmap_pdata), GFP_KERNEL); pdata = devm_kzalloc(dev, sizeof(struct chmap_pdata), GFP_KERNEL);
if (!pdata) if (!pdata) {
return -ENOMEM; ret = -ENOMEM;
goto free_backend;
}
if ((!strncmp(backend_name, "SLIM", strlen("SLIM"))) || if ((!strncmp(backend_name, "SLIM", strlen("SLIM"))) ||
(!strncmp(backend_name, "CODEC_DMA", strlen("CODEC_DMA")))) { (!strncmp(backend_name, "CODEC_DMA", strlen("CODEC_DMA")))) {
ctl_len = strlen(dai_link->stream_name) + 1 + ctl_len = strlen(dai_link->stream_name) + 1 +
strlen(mixer_ctl_name) + 1; strlen(mixer_ctl_name) + 1;
mixer_str = kzalloc(ctl_len, GFP_KERNEL); mixer_str = kzalloc(ctl_len, GFP_KERNEL);
if (!mixer_str) if (!mixer_str) {
return -ENOMEM; ret = -ENOMEM;
goto free_backend;
}
snprintf(mixer_str, ctl_len, "%s %s", dai_link->stream_name, snprintf(mixer_str, ctl_len, "%s %s", dai_link->stream_name,
mixer_ctl_name); mixer_ctl_name);
@@ -1168,14 +1172,16 @@ int msm_common_dai_link_init(struct snd_soc_pcm_runtime *rtd)
} }
free_mixer_str: free_mixer_str:
if (backend_name) {
kfree(backend_name);
backend_name = NULL;
}
if (mixer_str) { if (mixer_str) {
kfree(mixer_str); kfree(mixer_str);
mixer_str = NULL; mixer_str = NULL;
} }
free_backend:
if (backend_name) {
kfree(backend_name);
backend_name = NULL;
}
return ret; return ret;
} }