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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 D47D2C433DF for ; Mon, 10 Aug 2020 19:20:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AE652080C for ; Mon, 10 Aug 2020 19:20:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597087254; bh=9DgNbXuE12qTJhsSkDbD8Ork1WkIfuFJiXNEK4kiDKA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kXOBaaHBIUZDyX7SpQHRybc+STqN7OSQ1hBe/3dEOSjow4x/15sLT8kAsnFM0dDnZ GFb1HYKg2rblqL40Uk2RFqxtsmN/ssWiuDBgTup794mO/vXtQbQjij8OMm9FZSfock V5hLmbX+GpZrH7VcF2mMEsyB9KaH2h08+6flOj9s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729791AbgHJTNj (ORCPT ); Mon, 10 Aug 2020 15:13:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:44688 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729793AbgHJTNf (ORCPT ); Mon, 10 Aug 2020 15:13:35 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0FC1122B47; Mon, 10 Aug 2020 19:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597086814; bh=9DgNbXuE12qTJhsSkDbD8Ork1WkIfuFJiXNEK4kiDKA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=csh1Kxv61Td2EhckGUQWpqeW6hCfeO3bA7qXq+cLNQtwCPYx27y3nhGNRHCXTOu3r zElkGk6oRAg0xPHfKLOlhNNHCnMDO0V3Osh2eNyTBL+Wtc6FlYDd51GBTCPNcrSxvX +RSOnGC1ILc39cVKy1Pdzp2hZwxVzwEcRXfNaiEk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Evgeny Novikov , Felipe Balbi , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 24/31] usb: gadget: net2280: fix memory leak on probe error handling paths Date: Mon, 10 Aug 2020 15:12:52 -0400 Message-Id: <20200810191259.3794858-24-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200810191259.3794858-1-sashal@kernel.org> References: <20200810191259.3794858-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Evgeny Novikov [ Upstream commit 2468c877da428ebfd701142c4cdfefcfb7d4c00e ] Driver does not release memory for device on error handling paths in net2280_probe() when gadget_release() is not registered yet. The patch fixes the bug like in other similar drivers. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Evgeny Novikov Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/gadget/udc/net2280.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c index ee872cad52705..a87caad8d1c7e 100644 --- a/drivers/usb/gadget/udc/net2280.c +++ b/drivers/usb/gadget/udc/net2280.c @@ -3782,8 +3782,10 @@ static int net2280_probe(struct pci_dev *pdev, const struct pci_device_id *id) return 0; done: - if (dev) + if (dev) { net2280_remove(pdev); + kfree(dev); + } return retval; } -- 2.25.1