[alsa-devel] [PATCH] ALSA: lx6464es: Fix memory leaks in snd_lx6464es_create
In the implementation of snd_lx6464es_create() it there are memory leaks when error happens. Go to error path if any of these calls fail: lx_init_dsp(), lx_pcm_create(), lx_proc_create(), snd_ctl_add().
Fixes: 02bec4904508 ("ALSA: lx6464es - driver for the digigram lx6464es interface") Signed-off-by: Navid Emamdoost navid.emamdoost@gmail.com --- sound/pci/lx6464es/lx6464es.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c index fe10714380f2..7c6e8f4ef826 100644 --- a/sound/pci/lx6464es/lx6464es.c +++ b/sound/pci/lx6464es/lx6464es.c @@ -1020,25 +1020,26 @@ static int snd_lx6464es_create(struct snd_card *card, err = lx_init_dsp(chip); if (err < 0) { dev_err(card->dev, "error during DSP initialization\n"); - return err; + goto cleanup; }
err = lx_pcm_create(chip); if (err < 0) - return err; + goto cleanup;
err = lx_proc_create(card, chip); if (err < 0) - return err; + goto cleanup;
err = snd_ctl_add(card, snd_ctl_new1(&lx_control_playback_switch, chip)); if (err < 0) - return err; + goto cleanup;
*rchip = chip; return 0;
+cleanup: device_new_failed: free_irq(pci->irq, chip);
On Sun, 27 Oct 2019 20:24:13 +0100, Navid Emamdoost wrote:
In the implementation of snd_lx6464es_create() it there are memory leaks when error happens. Go to error path if any of these calls fail: lx_init_dsp(), lx_pcm_create(), lx_proc_create(), snd_ctl_add().
Again no for this patch, it'll lead to double-frees. After registered via snd_device_new(), the device object gets released by its callback and the single snd_card_free() call suffices.
thanks,
Takashi
Fixes: 02bec4904508 ("ALSA: lx6464es - driver for the digigram lx6464es interface") Signed-off-by: Navid Emamdoost navid.emamdoost@gmail.com
sound/pci/lx6464es/lx6464es.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c index fe10714380f2..7c6e8f4ef826 100644 --- a/sound/pci/lx6464es/lx6464es.c +++ b/sound/pci/lx6464es/lx6464es.c @@ -1020,25 +1020,26 @@ static int snd_lx6464es_create(struct snd_card *card, err = lx_init_dsp(chip); if (err < 0) { dev_err(card->dev, "error during DSP initialization\n");
return err;
goto cleanup;
}
err = lx_pcm_create(chip); if (err < 0)
return err;
goto cleanup;
err = lx_proc_create(card, chip); if (err < 0)
return err;
goto cleanup;
err = snd_ctl_add(card, snd_ctl_new1(&lx_control_playback_switch, chip)); if (err < 0)
return err;
goto cleanup;
*rchip = chip; return 0;
+cleanup: device_new_failed: free_irq(pci->irq, chip);
-- 2.17.1
participants (3)
-
Markus Elfring
-
Navid Emamdoost
-
Takashi Iwai