ALSA: hda: fix possible NULL dereference
authorMarkus Osterhoff <linux-kernel@k-raum.org>
Mon, 24 Aug 2015 12:11:39 +0000 (14:11 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 24 Aug 2015 13:02:03 +0000 (15:02 +0200)
After a for-loop was replaced by list_for_each_entry, see
Commit bbbc7e8502c9 ("ALSA: hda - Allocate hda_pcm objects dynamically"),
Commit 751e2216899c ("ALSA: hda: fix possible null dereference"),
a possible NULL pointer dereference has been introduced; this patch adds
the NULL check on pcm->pcm, while leaving a potentially superfluous
check on pcm itself untouched.

Signed-off-by: Markus Osterhoff <linux-kernel@k-raum.org>
Cc: <stable@vger.kernel.org> #v4.1+
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_codec.c

index 5de3c5d8c2c0050c5c560c9aecfd0ab756932a59..d1a2cb65e27cd76b668c2ce2cb9a909787eca2a7 100644 (file)
@@ -3172,7 +3172,7 @@ static int add_std_chmaps(struct hda_codec *codec)
                        struct snd_pcm_chmap *chmap;
                        const struct snd_pcm_chmap_elem *elem;
 
-                       if (!pcm || pcm->own_chmap ||
+                       if (!pcm || !pcm->pcm || pcm->own_chmap ||
                            !hinfo->substreams)
                                continue;
                        elem = hinfo->chmap ? hinfo->chmap : snd_pcm_std_chmaps;