From patchwork Mon Oct 24 11:29:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8448 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp401724wru; Mon, 24 Oct 2022 04:49:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM669rIn/eqUg2mLmoweA2ELjhchuE22JchAxLmysblUxuj5imTg47ELa5H+6P+PtN0Ii1zW X-Received: by 2002:a17:90b:3e83:b0:212:de17:952c with SMTP id rj3-20020a17090b3e8300b00212de17952cmr14688359pjb.102.1666612144001; Mon, 24 Oct 2022 04:49:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612143; cv=none; d=google.com; s=arc-20160816; b=l3rPtj5DmUVJ7JveQk0+YlHXcCQlU5YXftOfa5RdNGMuf+HCxYa1udfj8R0gX/f4v3 xtufZdOtoIrzi/3EL+tpvUqEvLZA6SCnJcT3JsEoFsK1QicsHe8SLQxcdO9wEp1xj6O8 MzMQotyquJcIJ0aD6/R5ktFIIh8quhKg5I/DTBYllw4XGdgpzChEil3fXuQys00gBU6p QWm+5ktB77IRUILoRYKcyeZOWWbwAgaurO2jN/NJwk9m9XCQkUKdkZiJilhDTqJXfIFY A/slzi+s4CE4SfXddoAl8WqRp8olbkfopAZBKuPOB6mR0DJlh3435l/85EKqa1XrFhWv D9NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kOix95pjwXB+QgS3L9sboGHqxj4zrRs8hh+5Ik5JBcU=; b=lfNP6Vkj58umF4yWMtIoXIlT0YC8vtsgnZO6W42AX/0xsNhwTn8H1S31S0uz2hzS0a 25cMOf1gkDRv1nDEe2ejXw+O6k1SquJrMeI+t59hC+7hbjJgQgfckGJyEWhWbzAWY3L4 D7NuFGdQITEN0W8IbO8H4j3I341XrKJ98RReWgx6h6jBW1IAXs4CMj8ORVF+gSUHTRrU zeXyfpNNQofnQWcxThLMGb8G1Wu9cOMSkotCKj6briqmJJCU1MF1D8aODJ9U1ivBPfsd u8ZT+aVVIUbdpX0YLNdMtfGAo8qVt8HXFXBdfu/JXyAT2yKa50P/3P2bKjDA5jAEqfk7 JfhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=liEUVott; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jc12-20020a17090325cc00b0018683763131si9342989plb.501.2022.10.24.04.48.49; Mon, 24 Oct 2022 04:49:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=liEUVott; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231751AbiJXLsW (ORCPT + 99 others); Mon, 24 Oct 2022 07:48:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231558AbiJXLrc (ORCPT ); Mon, 24 Oct 2022 07:47:32 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 577067647F; Mon, 24 Oct 2022 04:42:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id AE05BCE1333; Mon, 24 Oct 2022 11:40:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1B71C433C1; Mon, 24 Oct 2022 11:40:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611610; bh=qQlgW8kTrMb8YUt5Euhjz1KQWPFftvE0dgmxeMxKkyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=liEUVottFODe2HBmt/BpzlAIQ1vx8HFp0Lc1K7JlN4EJjHAf44JIJ7UBEinkhITlG WPfOzjc8nEqwxDnwUjznmi+4HX5dKysWzFcKLsYB4NrNHNgMhRF30JT7dHVNCaAXzh RYHVuobnEI5nPpQyz5kAEcxTsJjtLZVHtGWzAiKI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 4.9 043/159] ALSA: usb-audio: Fix potential memory leaks Date: Mon, 24 Oct 2022 13:29:57 +0200 Message-Id: <20221024112950.959546360@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747569495393818032?= X-GMAIL-MSGID: =?utf-8?q?1747569495393818032?= From: Takashi Iwai 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: Link: https://lore.kernel.org/r/20220930100151.19461-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/endpoint.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -804,6 +804,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; @@ -823,8 +824,6 @@ static int sync_ep_set_params(struct snd u->urb->complete = snd_complete_urb; } - ep->nurbs = SYNC_URBS; - return 0; out_of_memory: