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=-10.1 required=3.0 tests=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 25F06C3A5A3 for ; Thu, 29 Aug 2019 18:17:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0FE7233FF for ; Thu, 29 Aug 2019 18:17:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102673; bh=xCREaTygv8b8nm+QPF3XKV3E36VYjZhtrpivCPCooeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kTLaBJwKgQKOXHNZTypFOzIDdnOR5PmccC/q/nmfvG9MpRNRv1LJjc25+rO7ZIZMi AeAhFX6IL606Rz5HyT71Wi6c75h18Pfe42VW4IVTd0NH90CHNF++WHArQaB7bKisGQ 4NI8PlYjYPmUQ8FiYqc8KhCAQ+9pNCeudis7P8Zo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730239AbfH2SRw (ORCPT ); Thu, 29 Aug 2019 14:17:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:60052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728939AbfH2SRv (ORCPT ); Thu, 29 Aug 2019 14:17:51 -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 4655A2189D; Thu, 29 Aug 2019 18:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102670; bh=xCREaTygv8b8nm+QPF3XKV3E36VYjZhtrpivCPCooeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aUNYCriMUrIC5DmgsPmiUgJs5ZaWp/m0Uu3QWKDWOKZ27kGauogtzebmV7Xy5PXqT vMNoxHczYlGP12Cz1C+3j8u/XdKTw8hBPaG02EWCsQT8ezqxgmrf4LPzQikT0fk5iS J9FF5x0ZBiWNO7+ddwFhV6nt2bLJEHMQ8GFBgy+A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenwen Wang , "David S . Miller" , Sasha Levin , linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 08/16] cx82310_eth: fix a memory leak bug Date: Thu, 29 Aug 2019 14:17:26 -0400 Message-Id: <20190829181736.9040-8-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190829181736.9040-1-sashal@kernel.org> References: <20190829181736.9040-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wenwen Wang [ Upstream commit 1eca92eef18719027d394bf1a2d276f43e7cf886 ] In cx82310_bind(), 'dev->partial_data' is allocated through kmalloc(). Then, the execution waits for the firmware to become ready. If the firmware is not ready in time, the execution is terminated. However, the allocated 'dev->partial_data' is not deallocated on this path, leading to a memory leak bug. To fix this issue, free 'dev->partial_data' before returning the error. Signed-off-by: Wenwen Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/cx82310_eth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c index 947bea81d9241..dfbdea22fbad9 100644 --- a/drivers/net/usb/cx82310_eth.c +++ b/drivers/net/usb/cx82310_eth.c @@ -175,7 +175,8 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf) } if (!timeout) { dev_err(&udev->dev, "firmware not ready in time\n"); - return -ETIMEDOUT; + ret = -ETIMEDOUT; + goto err; } /* enable ethernet mode (?) */ -- 2.20.1