ALSA: hda - Fix memory leaks in conexant jack arrays
authorTakashi Iwai <tiwai@suse.de>
Wed, 2 Feb 2011 16:16:38 +0000 (17:16 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 2 Feb 2011 16:16:38 +0000 (17:16 +0100)
The Conexant codec driver adds the jack arrays in init callback which
may be called also in each PM resume.  This results in the addition of
new jack element at each time.

The fix is to check whether the requested jack is already present in
the array.

Reference: Novell bug 668929
https://bugzilla.novell.com/show_bug.cgi?id=668929

Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_conexant.c

index 7e1ca43bd6603f3ae11661846cb7421eb5741fdb..fbe97d32140dede38047797f04b1e4c4796cdbe7 100644 (file)
@@ -407,10 +407,16 @@ static int conexant_add_jack(struct hda_codec *codec,
        struct conexant_spec *spec;
        struct conexant_jack *jack;
        const char *name;
-       int err;
+       int i, err;
 
        spec = codec->spec;
        snd_array_init(&spec->jacks, sizeof(*jack), 32);
+
+       jack = spec->jacks.list;
+       for (i = 0; i < spec->jacks.used; i++, jack++)
+               if (jack->nid == nid)
+                       return 0 ; /* already present */
+
        jack = snd_array_new(&spec->jacks);
        name = (type == SND_JACK_HEADPHONE) ? "Headphone" : "Mic" ;