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

Commit 751e2216 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Takashi Iwai
Browse files

ALSA: hda: fix possible null dereference 



we are dereferencing pcm first then checking pcm. instead now lets put
them in same if condition so that pcm is checked first.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 382fd7be

sound/pci/hda/hda_codec.c

+2 −3
Original line number Diff line number Diff line
@@ -3230,9 +3230,8 @@ static int add_std_chmaps(struct hda_codec *codec) 
			struct snd_pcm_chmap *chmap;

			const struct snd_pcm_chmap_elem *elem;



			if (pcm->own_chmap)

				continue;

			if (!pcm || !hinfo->substreams)

			if (!pcm || pcm->own_chmap ||

			    !hinfo->substreams)

				continue;

			elem = hinfo->chmap ? hinfo->chmap : snd_pcm_std_chmaps;

			err = snd_pcm_add_chmap_ctls(pcm->pcm, str, elem,