| Date | Tue, 15 Feb 2011 16:12:25 -0800 | From | Greg KH <> | Subject | [088/272] ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection |
| |
2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit 80c678526d7da73bde4d46a4622449c2b3c88409 upstream.
When only one mic is available and it's an analog mic, the current IDT/STAC parser may give an Oops.
Reference: bko#25692 https://bugzilla.kernel.org/show_bug.cgi?id=25692
Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- sound/pci/hda/patch_sigmatel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -3591,7 +3591,7 @@ static int stac_check_auto_mic(struct hd if (check_mic_pin(codec, spec->dmic_nids[i], &fixed, &ext, &dock)) return 0; - if (!fixed && !ext && !dock) + if (!fixed || (!ext && !dock)) return 0; /* no input to switch */ if (!(get_wcaps(codec, ext) & AC_WCAP_UNSOL_CAP)) return 0; /* no unsol support */
|