diff options
| author | Wenwen Wang | 2019-08-07 11:08:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-08-16 10:12:51 +0200 |
| commit | 1c286e4e13f258a948dc20396eaae475ea930040 (patch) | |
| tree | aa7ee4f38176be9160a16902f82c1fa4e78861f0 /sound | |
| parent | ALSA: firewire: fix a memory leak bug (diff) | |
| download | kernel-qcow2-linux-1c286e4e13f258a948dc20396eaae475ea930040.tar.gz kernel-qcow2-linux-1c286e4e13f258a948dc20396eaae475ea930040.tar.xz kernel-qcow2-linux-1c286e4e13f258a948dc20396eaae475ea930040.zip | |
ALSA: hiface: fix multiple memory leak bugs
commit 3d92aa45fbfd7319e3a19f4ec59fd32b3862b723 upstream.
In hiface_pcm_init(), 'rt' is firstly allocated through kzalloc(). Later
on, hiface_pcm_init_urb() is invoked to initialize 'rt->out_urbs[i]'. In
hiface_pcm_init_urb(), 'rt->out_urbs[i].buffer' is allocated through
kzalloc(). However, if hiface_pcm_init_urb() fails, both 'rt' and
'rt->out_urbs[i].buffer' are not deallocated, leading to memory leak bugs.
Also, 'rt->out_urbs[i].buffer' is not deallocated if snd_pcm_new() fails.
To fix the above issues, free 'rt' and 'rt->out_urbs[i].buffer'.
Fixes: a91c3fb2f842 ("Add M2Tech hiFace USB-SPDIF driver")
Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/hiface/pcm.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c index e1fbb9cc9ea7..a197fc3b9ab0 100644 --- a/sound/usb/hiface/pcm.c +++ b/sound/usb/hiface/pcm.c @@ -604,14 +604,13 @@ int hiface_pcm_init(struct hiface_chip *chip, u8 extra_freq) ret = hiface_pcm_init_urb(&rt->out_urbs[i], chip, OUT_EP, hiface_pcm_out_urb_handler); if (ret < 0) - return ret; + goto error; } ret = snd_pcm_new(chip->card, "USB-SPDIF Audio", 0, 1, 0, &pcm); if (ret < 0) { - kfree(rt); dev_err(&chip->dev->dev, "Cannot create pcm instance\n"); - return ret; + goto error; } pcm->private_data = rt; @@ -624,4 +623,10 @@ int hiface_pcm_init(struct hiface_chip *chip, u8 extra_freq) chip->pcm = rt; return 0; + +error: + for (i = 0; i < PCM_N_URBS; i++) + kfree(rt->out_urbs[i].buffer); + kfree(rt); + return ret; } |