Przeglądaj źródła

ALSA: hda - Fix memory leaks in conexant jack arrays

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>
Takashi Iwai 14 lat temu
rodzic
commit
70f7db11c4
1 zmienionych plików z 7 dodań i 1 usunięć
  1. 7 1
      sound/pci/hda/patch_conexant.c

+ 7 - 1
sound/pci/hda/patch_conexant.c

@@ -407,10 +407,16 @@ static int conexant_add_jack(struct hda_codec *codec,
 	struct conexant_spec *spec;
 	struct conexant_spec *spec;
 	struct conexant_jack *jack;
 	struct conexant_jack *jack;
 	const char *name;
 	const char *name;
-	int err;
+	int i, err;
 
 
 	spec = codec->spec;
 	spec = codec->spec;
 	snd_array_init(&spec->jacks, sizeof(*jack), 32);
 	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);
 	jack = snd_array_new(&spec->jacks);
 	name = (type == SND_JACK_HEADPHONE) ? "Headphone" : "Mic" ;
 	name = (type == SND_JACK_HEADPHONE) ? "Headphone" : "Mic" ;