Skip to content

Commit

Permalink
sound: oxygen: fix NULL pointer dereference when loading snd-oxygen
Browse files Browse the repository at this point in the history
Check that model->control_filter is set before trying to call it.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Clemens Ladisch authored and Takashi Iwai committed Jun 16, 2008
1 parent 0665190 commit 9f9115d
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions sound/pci/oxygen/oxygen_mixer.c
Original file line number Diff line number Diff line change
Expand Up @@ -936,11 +936,13 @@ static int add_controls(struct oxygen *chip,

for (i = 0; i < count; ++i) {
template = controls[i];
err = chip->model->control_filter(&template);
if (err < 0)
return err;
if (err == 1)
continue;
if (chip->model->control_filter) {
err = chip->model->control_filter(&template);
if (err < 0)
return err;
if (err == 1)
continue;
}
if (!strcmp(template.name, "Master Playback Volume") &&
chip->model->dac_tlv) {
template.tlv.p = chip->model->dac_tlv;
Expand Down

0 comments on commit 9f9115d

Please sign in to comment.