torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

ALSA: hda: fix possible null dereference

Browse Source 
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: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Sudip Mukherjee 2015-04-02 16:51:43 +05:30 committed by Takashi Iwai
parent 382fd7becc
commit 751e221689
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/pci/hda/hda_codec.c
View File

@ -3230,9 +3230,8 @@ static int add_std_chmaps(struct hda_codec *codec)
struct snd_pcm_chmap *chmap; struct snd_pcm_chmap *chmap;
const struct snd_pcm_chmap_elem *elem; const struct snd_pcm_chmap_elem *elem;
if (pcm->own_chmap) if (!pcm || pcm->own_chmap ||
continue; !hinfo->substreams)
if (!pcm || !hinfo->substreams)
continue; continue;
elem = hinfo->chmap ? hinfo->chmap : snd_pcm_std_chmaps; elem = hinfo->chmap ? hinfo->chmap : snd_pcm_std_chmaps;
err = snd_pcm_add_chmap_ctls(pcm->pcm, str, elem, err = snd_pcm_add_chmap_ctls(pcm->pcm, str, elem,