| Message ID | 1565168932-6337-1-git-send-email-wenwen@cs.uga.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] ALSA: hiface: fix multiple memory leak bugs | expand |
On Wed, 07 Aug 2019 11:08:51 +0200, Wenwen Wang wrote: > > 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'. > > Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> Applied now. Thanks! Takashi
diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c index 14fc1e1..c406497 100644 --- a/sound/usb/hiface/pcm.c +++ b/sound/usb/hiface/pcm.c @@ -600,14 +600,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; @@ -620,4 +619,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; }
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'. Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> --- sound/usb/hiface/pcm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)