Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7e69ae6 authored by Markus Osterhoff's avatar Markus Osterhoff Committed by Takashi Iwai
Browse files

ALSA: hda: fix possible NULL dereference 



After a for-loop was replaced by list_for_each_entry, see
Commit bbbc7e85 ("ALSA: hda - Allocate hda_pcm objects dynamically"),
Commit 751e2216 ("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: default avatarMarkus Osterhoff <linux-kernel@k-raum.org>
Cc: <stable@vger.kernel.org> #v4.1+
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f6b28e4d

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -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;