iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: usb: stream: fix potential memory leak during uac3 interface parsing

Browse Source 
UAC3 channel map is created during interface parsing,
and in some cases was not freed in failure paths.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ruslan Bilovol <ruslan.bilovol@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Ruslan Bilovol 2018-05-18 01:08:59 +03:00 committed by Takashi Iwai
parent 11d42c8103
commit 6cd17ea70b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/usb/stream.c
View File

@ -982,13 +982,16 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip,
dev_err(&dev->dev, "%u:%d : bogus bTerminalLink %d\n",
iface_no, altno, as->bTerminalLink);
kfree(chmap);
return NULL;
found_clock:
fp = audio_format_alloc_init(chip, alts, UAC_VERSION_3, iface_no,
altset_idx, altno, num_channels, clock);
if (!fp)
if (!fp) {
kfree(chmap);
return ERR_PTR(-ENOMEM);
}
fp->chmap = chmap;
@ -1009,6 +1012,7 @@ found_clock:
iface_no);
/* ok, let's parse further... */
if (snd_usb_parse_audio_format_v3(chip, fp, as, stream) < 0) {
kfree(fp->chmap);
kfree(fp->rate_table);
kfree(fp);
return NULL;