diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-09-30 12:01:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-26 13:19:19 +0200 |
| commit | 46f0aed47673e275d682af60ed26dcc28add8eae (patch) | |
| tree | b0259363fea2808d151c0d0c21488f420012bc0a /sound/usb | |
| parent | b033ac7abde6cbc59f32a6209af1d7713d159d5b (diff) | |
| download | linux-stable-46f0aed47673e275d682af60ed26dcc28add8eae.tar.gz linux-stable-46f0aed47673e275d682af60ed26dcc28add8eae.tar.bz2 linux-stable-46f0aed47673e275d682af60ed26dcc28add8eae.zip | |
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: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/endpoint.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 727ef9889e94..90c89847ad71 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -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: |