From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 28 Oct 2013 10:39:23 +0000 (+0100)
Subject: ALSA: hda - Fix possible NULL dereference in snd_hda_get_pin_label()
X-Git-Tag: firefly_0821_release~176^2~4889^2~99
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=728deecdd4e9b4a58faf518638169c743c57cee2;p=firefly-linux-kernel-4.4.55.git

ALSA: hda - Fix possible NULL dereference in snd_hda_get_pin_label()

Fix a possible NULL access of indexp in fill_audio_out_name() called
from snd_hda_get_pin_label().

Spotted by coverity CID 402035.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index 48a9d004d6d9..853c6a69e29e 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -638,7 +638,7 @@ static int fill_audio_out_name(struct hda_codec *codec, hda_nid_t nid,
 			/* don't add channel suffix for Headphone controls */
 			int idx = get_hp_label_index(codec, nid, cfg->hp_pins,
 						     cfg->hp_outs);
-			if (idx >= 0)
+			if (idx >= 0 && indexp)
 				*indexp = idx;
 			sfx = "";
 		}