Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46f0aed4 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

ALSA: usb-audio: Fix potential memory leaks 

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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b033ac7a

sound/usb/endpoint.c

+1 −2
Original line number Diff line number Diff line
@@ -816,6 +816,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;
@@ -835,8 +836,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: