diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-02 17:16:38 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-02 17:16:38 +0100 |
| commit | 70f7db11c45a313b23922cacf248c613c3b2144c (patch) | |
| tree | d7d5b6bab9d76f15b7539cb9147d76a338db42ec | |
| parent | 6abb31908f3ed7d38e93d06b704c9342029ca9a0 (diff) | |
| download | kernel_goldelico_gta04-70f7db11c45a313b23922cacf248c613c3b2144c.zip kernel_goldelico_gta04-70f7db11c45a313b23922cacf248c613c3b2144c.tar.gz kernel_goldelico_gta04-70f7db11c45a313b23922cacf248c613c3b2144c.tar.bz2 | |
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>
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 7e1ca43..fbe97d3 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/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_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" ; |