From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4553C43331 for ; Mon, 11 Nov 2019 18:45:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D9C3214E0 for ; Mon, 11 Nov 2019 18:45:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497909; bh=NAogkW33fSfT/LC/kozI9usm/VdaqyUYpaY1pwI9Gy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nP+SNiWL1w1O3lpK6itFo9w+8+AtgpzGFLOduE+4kZ0IxaTj6NXbcoxkXPzjXxNnu j9cscF9+Ar3Z/pTruQu4jSdEvG8h/zI1pKCNo8CefwFKw5L0mwZNNP02no1oeqDdo5 nRmpmduBwzihRiMoYpDgORAYcp1Z7dok4s2e38BQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729822AbfKKSpH (ORCPT ); Mon, 11 Nov 2019 13:45:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:36940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728857AbfKKSpD (ORCPT ); Mon, 11 Nov 2019 13:45:03 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 89298204FD; Mon, 11 Nov 2019 18:45:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497902; bh=NAogkW33fSfT/LC/kozI9usm/VdaqyUYpaY1pwI9Gy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=je/zu3lu7Jetmw40JqkHrbhKyqwxqd9RSZzuqD+6Q+dFf+SewyM9JlDElm9vGZP4f LoVOtcHT2e1tcxmIukJVoL5Qvs1FrLyExpHc6tAOPP9W2Bdny5yc9oq9ugxLNNueoW rhbb+Fg+hcAXbAG8CAuXQLsdJDGw7R8YM4Py3IVk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , Felipe Balbi , Sasha Levin Subject: [PATCH 4.19 092/125] usb: dwc3: pci: prevent memory leak in dwc3_pci_probe Date: Mon, 11 Nov 2019 19:28:51 +0100 Message-Id: <20191111181452.221804790@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181438.945353076@linuxfoundation.org> References: <20191111181438.945353076@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Navid Emamdoost [ Upstream commit 9bbfceea12a8f145097a27d7c7267af25893c060 ] In dwc3_pci_probe a call to platform_device_alloc allocates a device which is correctly put in case of error except one case: when the call to platform_device_add_properties fails it directly returns instead of going to error handling. This commit replaces return with the goto. Fixes: 1a7b12f69a94 ("usb: dwc3: pci: Supply device properties via driver data") Signed-off-by: Navid Emamdoost Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/dwc3/dwc3-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c index 8cced3609e243..b4e42d597211a 100644 --- a/drivers/usb/dwc3/dwc3-pci.c +++ b/drivers/usb/dwc3/dwc3-pci.c @@ -256,7 +256,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) ret = platform_device_add_properties(dwc->dwc3, p); if (ret < 0) - return ret; + goto err; ret = dwc3_pci_quirks(dwc); if (ret) -- 2.20.1