diff options
| author | Jia-Ju Bai <baijiaju1990@gmail.com> | 2019-07-26 04:14:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-07-26 14:25:37 +0200 |
| commit | 2127c01b7f63b06a21559f56a8c81a3c6535bd1a (patch) | |
| tree | c93b0d77365a349af43d033a85a9ed774b8f0f5a /sound/i2c | |
| parent | ALSA: hda - Show the fatal CORB/RIRB error more clearly (diff) | |
| download | linux-2127c01b7f63b06a21559f56a8c81a3c6535bd1a.tar.xz linux-2127c01b7f63b06a21559f56a8c81a3c6535bd1a.zip | |
ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls()
In build_adc_controls(), there is an if statement on line 773 to check
whether ak->adc_info is NULL:
if (! ak->adc_info ||
! ak->adc_info[mixer_ch].switch_name)
When ak->adc_info is NULL, it is used on line 792:
knew.name = ak->adc_info[mixer_ch].selector_name;
Thus, a possible null-pointer dereference may occur.
To fix this bug, referring to lines 773 and 774, ak->adc_info
and ak->adc_info[mixer_ch].selector_name are checked before being used.
This bug is found by a static analysis tool STCheck written by us.
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/i2c')
| -rw-r--r-- | sound/i2c/other/ak4xxx-adda.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index 5f59316f982a..7d15093844b9 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c @@ -775,11 +775,12 @@ static int build_adc_controls(struct snd_akm4xxx *ak) return err; memset(&knew, 0, sizeof(knew)); - knew.name = ak->adc_info[mixer_ch].selector_name; - if (!knew.name) { + if (!ak->adc_info || + !ak->adc_info[mixer_ch].selector_name) { knew.name = "Capture Channel"; knew.index = mixer_ch + ak->idx_offset * 2; - } + } else + knew.name = ak->adc_info[mixer_ch].selector_name; knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER; knew.info = ak4xxx_capture_source_info; |