| Message ID | 20200825120531.1479304-2-yukuai3@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | do exception handling appropriately in imx_es8328_probe() | expand |
On Tue, Aug 25, 2020 at 08:05:30PM +0800, Yu Kuai wrote: > If memory allocation for 'data' or 'comp' succeed, imx_es8328_probe() > doesn't have corresponding kfree() in exception handling. Thus add > kfree() for this function implementation. > @@ -151,7 +151,7 @@ static int imx_es8328_probe(struct platform_device *pdev) > comp = devm_kzalloc(dev, 3 * sizeof(*comp), GFP_KERNEL); > if (!comp) { The allocation is being done using devm_ which means no explicit kfree() is needed, the allocation will be automatically unwound when the device is unbound.
On 2020/08/25 20:11, Mark Brown wrote: > On Tue, Aug 25, 2020 at 08:05:30PM +0800, Yu Kuai wrote: >> If memory allocation for 'data' or 'comp' succeed, imx_es8328_probe() >> doesn't have corresponding kfree() in exception handling. Thus add >> kfree() for this function implementation. > >> @@ -151,7 +151,7 @@ static int imx_es8328_probe(struct platform_device *pdev) >> comp = devm_kzalloc(dev, 3 * sizeof(*comp), GFP_KERNEL); >> if (!comp) { > > The allocation is being done using devm_ which means no explicit kfree() > is needed, the allocation will be automatically unwound when the device > is unbound. Hi, Thanks for pointing it out, I'll remove this patch. Best regards, Yu Kuai
diff --git a/sound/soc/fsl/imx-es8328.c b/sound/soc/fsl/imx-es8328.c index 15a27a2cd0ca..8f71ed3a6f75 100644 --- a/sound/soc/fsl/imx-es8328.c +++ b/sound/soc/fsl/imx-es8328.c @@ -151,7 +151,7 @@ static int imx_es8328_probe(struct platform_device *pdev) comp = devm_kzalloc(dev, 3 * sizeof(*comp), GFP_KERNEL); if (!comp) { ret = -ENOMEM; - goto fail; + goto free_data; } data->dev = dev; @@ -182,12 +182,12 @@ static int imx_es8328_probe(struct platform_device *pdev) ret = snd_soc_of_parse_card_name(&data->card, "model"); if (ret) { dev_err(dev, "Unable to parse card name\n"); - goto fail; + goto free_comp; } ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing"); if (ret) { dev_err(dev, "Unable to parse routing: %d\n", ret); - goto fail; + goto free_comp; } data->card.num_links = 1; data->card.owner = THIS_MODULE; @@ -196,10 +196,14 @@ static int imx_es8328_probe(struct platform_device *pdev) ret = snd_soc_register_card(&data->card); if (ret) { dev_err(dev, "Unable to register: %d\n", ret); - goto fail; + goto free_comp; } platform_set_drvdata(pdev, data); +free_comp: + kfree(comp); +free_data: + kfree(data); fail: of_node_put(ssi_np); of_node_put(codec_np);
If memory allocation for 'data' or 'comp' succeed, imx_es8328_probe() doesn't have corresponding kfree() in exception handling. Thus add kfree() for this function implementation. Fixes: 7e7292dba215 ("ASoC: fsl: add imx-es8328 machine driver") Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- sound/soc/fsl/imx-es8328.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)