Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1332104imm; Thu, 23 Aug 2018 00:58:32 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaDgFlt4iFvT0iMCE4VQJTTDN+N7xp4HHVb0+fCxlwzDFH1ewP6qOyLEjECBZCSjrQwIfzX X-Received: by 2002:a63:b53:: with SMTP id a19-v6mr7606504pgl.280.1535011112280; Thu, 23 Aug 2018 00:58:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535011112; cv=none; d=google.com; s=arc-20160816; b=L17nJkKGzbaIVyWa32Euq3PNhAVbrbxMQEvngyxXukzsEnqkSE1dcsMZVDgxs7UP8b dmeAfhBHbxNRiPauKT2jGxK6zqqGvfsYwPsj2kOJK/JNo2jliSa4v+9q8QbLzimzZzow ALEUJ6jTjN0kTACYUxTs4/MUEu6f+qErT3Fu+8VXdfQHz9H0O6fxQ/JgGw5sXkLDnBdD ys2J+8Pzbg7fzly0c5gB3tPqkLncLGEnNX2EV+HXW9Bj9voa5NIr1ljYCjcz2/X6NKFX 76kLwPNHPZggzvu4ar/6yYLfbrBzcxgdcHuer3u5hB61U/V2Ii/qfbteTgELcIPPomOf B1dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=K05OPjOJhcH5kqA9NOS8srVBWJ+IUJBMoxy5JcpXgUY=; b=BmvImHsWgcWvc+CzG4YTXovVKP9f8M1coWC3z3wOMnt4hS+kHl0/qy5qDqLHUbUjd5 ip9Bk2WMITalZ/+BxvPSJF5uJYCi6nhmFSJ67MfVPr/6awIhhwqoKDCaMBEqkOptfYqQ DdgT7TyR9jTuLewkIijZYBCqU2+Sm2VabsLv8fqecRbMBaEFPh8+ZmBmVdvB81yC4PoN au7A/5k5G6G0dbjIXpT6kabp/UoNGEqDtHoNl1vwsW8lPVpEA8AKldsWDLjr91GGQlxG 6NAmQ2Wm1bnR9UQJlyPamGmTXVciB2ql9ItqynZVUqQnrkzlh+nEItlaRp8R4HjqT43r AAQA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w188-v6si4047190pfw.307.2018.08.23.00.58.17; Thu, 23 Aug 2018 00:58:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727175AbeHWLZc (ORCPT + 99 others); Thu, 23 Aug 2018 07:25:32 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:41536 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726451AbeHWLZb (ORCPT ); Thu, 23 Aug 2018 07:25:31 -0400 Received: from localhost (5355525A.cm-6-6b.dynamic.ziggo.nl [83.85.82.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id E8EE0ACC; Thu, 23 Aug 2018 07:57:08 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Wahren , Marek Szyprowski , Minas Harutyunyan , Grigor Tovmasyan , Felipe Balbi , Sasha Levin Subject: [PATCH 4.4 11/79] usb: gadget: dwc2: fix memory leak in gadget_init() Date: Thu, 23 Aug 2018 09:52:47 +0200 Message-Id: <20180823074919.407815478@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180823074918.641878835@linuxfoundation.org> References: <20180823074918.641878835@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Grigor Tovmasyan [ Upstream commit 9bb073a053f0464ea74a4d4c331fdb7da58568d6 ] Freed allocated request for ep0 to prevent memory leak in case when dwc2_driver_probe() failed. Cc: Stefan Wahren Cc: Marek Szyprowski Tested-by: Stefan Wahren Tested-by: Marek Szyprowski Acked-by: Minas Harutyunyan Signed-off-by: Grigor Tovmasyan Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc2/gadget.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -3657,9 +3657,11 @@ int dwc2_gadget_init(struct dwc2_hsotg * } ret = usb_add_gadget_udc(dev, &hsotg->gadget); - if (ret) + if (ret) { + dwc2_hsotg_ep_free_request(&hsotg->eps_out[0]->ep, + hsotg->ctrl_req); return ret; - + } dwc2_hsotg_dump(hsotg); return 0; @@ -3672,6 +3674,7 @@ int dwc2_gadget_init(struct dwc2_hsotg * int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg) { usb_del_gadget_udc(&hsotg->gadget); + dwc2_hsotg_ep_free_request(&hsotg->eps_out[0]->ep, hsotg->ctrl_req); return 0; }