From patchwork Thu Aug 20 09:22:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 265673 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 0B9E5C433E3 for ; Thu, 20 Aug 2020 10:28:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D70B920658 for ; Thu, 20 Aug 2020 10:28:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597919336; bh=e67Q7fUocfvXwkXO46xKXeEDHFgqw3oy/4IMdy9WuyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=quiw73u/4YcHzj6jVkL/yTZReiDsQJ7WJsjeHEv5AL9MBkJwynscjZ3k7CdVa+r/q DvhnDmyas4FALaZWxYtYW3al6XXY5Ia73RHlrtFQWTjY1zEV6sMdHHitkfz8QZVWZd wA9sDq4NHKtR7+85YgYoysiagxYcfO38bF8K1yKc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731665AbgHTK24 (ORCPT ); Thu, 20 Aug 2020 06:28:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:47948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731354AbgHTKV1 (ORCPT ); Thu, 20 Aug 2020 06:21:27 -0400 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 EBB7420738; Thu, 20 Aug 2020 10:21:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597918887; bh=e67Q7fUocfvXwkXO46xKXeEDHFgqw3oy/4IMdy9WuyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Iv5dekVPIYFBikdTdmK5KrucP7onT1tcTZ9Tdi5FoNQ3Gs2YPLqrEf8UKrT/FdRwj QRrVPz4YB3PPYHOeCL05aprG3NfYHdDI9zwDmF9HMuJv0M4Nuz8AWoRxUnc5+ODVwR Fw6c9YQG4qVSkXCBw/vIMO1SHFTTZSHgZCRFRm68= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Evgeny Novikov , Felipe Balbi , Sasha Levin Subject: [PATCH 4.4 072/149] usb: gadget: net2280: fix memory leak on probe error handling paths Date: Thu, 20 Aug 2020 11:22:29 +0200 Message-Id: <20200820092129.220631931@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820092125.688850368@linuxfoundation.org> References: <20200820092125.688850368@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 3a8d056a5d16b..48dd0da21e2b4 100644 --- a/drivers/usb/gadget/udc/net2280.c +++ b/drivers/usb/gadget/udc/net2280.c @@ -3712,8 +3712,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; }