lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 034/229] ALSA: usb-audio: Fix potential memory leaks
    Date
    From: Takashi Iwai <tiwai@suse.de>

    commit 6382da0828995af87aa8b8bef28cc61aceb4aff3 upstream.

    When the driver hits -ENOMEM at allocating a URB or a buffer, it
    aborts and goes to the error path that releases the all previously
    allocated resources. However, when -ENOMEM hits at the middle of the
    sync EP URB allocation loop, the partially allocated URBs might be
    left without released, because ep->nurbs is still zero at that point.

    Fix it by setting ep->nurbs at first, so that the error handler loops
    over the full URB list.

    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20220930100151.19461-1-tiwai@suse.de
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/usb/endpoint.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/sound/usb/endpoint.c
    +++ b/sound/usb/endpoint.c
    @@ -816,6 +816,7 @@ static int sync_ep_set_params(struct snd
    if (!ep->syncbuf)
    return -ENOMEM;

    + ep->nurbs = SYNC_URBS;
    for (i = 0; i < SYNC_URBS; i++) {
    struct snd_urb_ctx *u = &ep->urb[i];
    u->index = i;
    @@ -835,8 +836,6 @@ static int sync_ep_set_params(struct snd
    u->urb->complete = snd_complete_urb;
    }

    - ep->nurbs = SYNC_URBS;
    -
    return 0;

    out_of_memory:

    \
     
     \ /
      Last update: 2022-10-24 14:21    [W:4.038 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site