All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ALSA: pci: Fix memory leak in snd_korg1212_create
@ 2019-10-27 19:12 ` Navid Emamdoost
  0 siblings, 0 replies; 22+ messages in thread
From: Navid Emamdoost @ 2019-10-27 19:12 UTC (permalink / raw)
  Cc: emamd001, smccaman, kjlu, Navid Emamdoost, Jaroslav Kysela,
	Takashi Iwai, Greg Kroah-Hartman, Richard Fontana,
	Thomas Gleixner, alsa-devel, linux-kernel

In the implementation of snd_korg1212_create() the allocated memory for
korg1212 is leaked in cases of error. Release korg1212 via
snd_korg1212_free() if either of these calls fail:
snd_korg1212_downloadDSPCode(), snd_pcm_new(), or snd_ctl_add().

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
 sound/pci/korg1212/korg1212.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 0d81eac0a478..e976e857d915 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -2367,8 +2367,10 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci,
 
 	mdelay(CARD_BOOT_DELAY_IN_MS);
 
-        if (snd_korg1212_downloadDSPCode(korg1212))
+	if (snd_korg1212_downloadDSPCode(korg1212)) {
+		snd_korg1212_free(korg1212);
         	return -EBUSY;
+	}
 
         K1212_DEBUG_PRINTK("korg1212: dspMemPhy = %08x U[%08x], "
                "PlayDataPhy = %08x L[%08x]\n"
@@ -2383,8 +2385,11 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci,
                korg1212->RoutingTablePhy, LowerWordSwap(korg1212->RoutingTablePhy),
                korg1212->AdatTimeCodePhy, LowerWordSwap(korg1212->AdatTimeCodePhy));
 
-        if ((err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm)) < 0)
+	err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm);
+	if (err < 0) {
+		snd_korg1212_free(korg1212);
                 return err;
+	}
 
 	korg1212->pcm->private_data = korg1212;
         korg1212->pcm->private_free = snd_korg1212_free_pcm;
@@ -2398,8 +2403,10 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci,
 
         for (i = 0; i < ARRAY_SIZE(snd_korg1212_controls); i++) {
                 err = snd_ctl_add(korg1212->card, snd_ctl_new1(&snd_korg1212_controls[i], korg1212));
-                if (err < 0)
+		if (err < 0) {
+			snd_korg1212_free(korg1212);
                         return err;
+		}
         }
 
         snd_korg1212_proc_init(korg1212);
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2019-10-28 14:45 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-27 19:12 [PATCH] ALSA: pci: Fix memory leak in snd_korg1212_create Navid Emamdoost
2019-10-27 19:12 ` [alsa-devel] " Navid Emamdoost
2019-10-27 20:40 ` Markus Elfring
2019-10-27 20:40   ` [alsa-devel] " Markus Elfring
2019-10-27 20:40   ` Markus Elfring
2019-10-28  8:19   ` Markus Elfring
2019-10-28  8:19     ` [alsa-devel] " Markus Elfring
2019-10-28  8:19     ` Markus Elfring
2019-10-28  6:31 ` [PATCH] " Takashi Iwai
2019-10-28  6:31   ` [alsa-devel] " Takashi Iwai
2019-10-28  9:00   ` [alsa-devel] ALSA: korg1212: Checking exception handling in snd_korg1212_create() Markus Elfring
2019-10-28  9:00     ` Markus Elfring
2019-10-28  9:00     ` Markus Elfring
2019-10-28 13:15     ` Takashi Iwai
2019-10-28 13:15       ` Takashi Iwai
2019-10-28 13:15       ` Takashi Iwai
2019-10-28 14:40       ` Markus Elfring
2019-10-28 14:40         ` Markus Elfring
2019-10-28 14:40         ` Markus Elfring
2019-10-28 14:44         ` Takashi Iwai
2019-10-28 14:44           ` Takashi Iwai
2019-10-28 14:44           ` Takashi Iwai

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.