[PATCH openEuler-1.0-LTS] ALSA: usb-audio: Fix potential memory leaks
From: Takashi Iwai <tiwai@suse.de> stable inclusion from stable-v4.19.262 commit 46f0aed47673e275d682af60ed26dcc28add8eae category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ID0UAB CVE: CVE-2022-50484 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=... -------------------------------- 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> Signed-off-by: Wang Wensheng <wangwensheng4@huawei.com> --- sound/usb/endpoint.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index aeb74cc6ceff..1a788013f3dc 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -814,10 +814,11 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep) ep->syncbuf = usb_alloc_coherent(ep->chip->dev, SYNC_URBS * 4, GFP_KERNEL, &ep->sync_dma); 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; u->ep = ep; u->packets = 1; @@ -833,12 +834,10 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep) u->urb->interval = 1 << ep->syncinterval; u->urb->context = u; u->urb->complete = snd_complete_urb; } - ep->nurbs = SYNC_URBS; - return 0; out_of_memory: release_urbs(ep, 0); return -ENOMEM; -- 2.22.0
反馈: 您发送到kernel@openeuler.org的补丁/补丁集,已成功转换为PR! PR链接地址: https://gitee.com/openeuler/kernel/pulls/18657 邮件列表地址:https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/HI4... FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/openeuler/kernel/pulls/18657 Mailing list address: https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/HI4...
participants (2)
-
patchwork bot -
Wang Wensheng