diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-04-02 16:51:43 +0530 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-04 14:32:16 +0200 |
| commit | 751e2216899cb143fe1d5909fe762870faa945f6 (patch) | |
| tree | d69612e15878e09eef8498c414c27c360d422ad4 /sound/pci | |
| parent | 382fd7becc409be9cc18dea8e3d53f6d184f9a5c (diff) | |
| download | op-kernel-dev-751e2216899cb143fe1d5909fe762870faa945f6.zip op-kernel-dev-751e2216899cb143fe1d5909fe762870faa945f6.tar.gz | |
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: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 41851f9..16dfa1e 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -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, |
