lkml.org 
[lkml]   [2019]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 127/144] ALSA: hiface: fix multiple memory leak bugs
    Date
    From: Wenwen Wang <wenwen@cs.uga.edu>

    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>

    ---
    sound/usb/hiface/pcm.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    --- a/sound/usb/hiface/pcm.c
    +++ b/sound/usb/hiface/pcm.c
    @@ -600,14 +600,13 @@ int hiface_pcm_init(struct hiface_chip *
    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->pcm = rt;
    return 0;
    +
    +error:
    + for (i = 0; i < PCM_N_URBS; i++)
    + kfree(rt->out_urbs[i].buffer);
    + kfree(rt);
    + return ret;
    }

    \
     
     \ /
      Last update: 2019-08-14 19:26    [W:5.891 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site