ALSA: usb-audio: Fix potential memory leaks
authorTakashi Iwai <tiwai@suse.de>
Fri, 30 Sep 2022 10:01:51 +0000 (12:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Oct 2022 10:34:17 +0000 (12:34 +0200)
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

index 743b828..4196c3e 100644 (file)
@@ -1223,6 +1223,7 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep)
        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;
@@ -1242,8 +1243,6 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep)
                u->urb->complete = snd_complete_urb;
        }
 
-       ep->nurbs = SYNC_URBS;
-
        return 0;
 
 out_of_memory: