Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: hda - Fix NULL dereference in snd_hda_gen_build_controls()

Browse source 
When no controls are assigned in the parser (e.g. no analog path),
spec->kctls.list is still NULL.  We need to check it before passing to
snd_hda_add_new_ctls().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-12-19 15:15:10 +01:00
parent 9eb413e5e4
commit 36502d0200
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/pci/hda/hda_generic.c
View file

@ -2906,9 +2906,11 @@ int snd_hda_gen_build_controls(struct hda_codec *codec)
struct hda_gen_spec *spec = codec->spec;
int err;
err = snd_hda_add_new_ctls(codec, spec->kctls.list);
if (err < 0)
return err;
if (spec->kctls.used) {
err = snd_hda_add_new_ctls(codec, spec->kctls.list);
if (err < 0)
return err;
}
if (spec->multiout.dig_out_nid) {
err = snd_hda_create_dig_out_ctls(codec,