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,URIBL_BLOCKED,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 80112C433EF for ; Sun, 8 Sep 2019 12:53:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5854B20693 for ; Sun, 8 Sep 2019 12:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567947220; bh=oJTbKzxJkcEwZQlCxpeyvfC1qpG9Tz2Sjk5W6hTvbxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O0YO9Sh6ezpsYuI65Xw3mSlf6SJamDPUAEcohXu4z4eoBI6aYiiptI42XHAGIkYuf fLdv5poP8I3vQ4O7Uis0NUxwV7fhoJ/L2IxZYfzLZ7B0NRMD6O7vG8i/94Q8FI2iCN pKaMno9PKnGBLcHOaiipfERVWHQkBk0AMixoQeIc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387548AbfIHMxR (ORCPT ); Sun, 8 Sep 2019 08:53:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:46160 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387546AbfIHMxQ (ORCPT ); Sun, 8 Sep 2019 08:53:16 -0400 Received: from localhost (unknown [62.28.240.114]) (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 AA6BC21479; Sun, 8 Sep 2019 12:53:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567947196; bh=oJTbKzxJkcEwZQlCxpeyvfC1qpG9Tz2Sjk5W6hTvbxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I5N+UIv8YmvRQe6bitKlrRnUJi6UI9Rmmt4HXIuYcDK4Us6MEX5LvwWDnru6rngQ4 1kZDr6dFArGyVXZvCciGUVzfoP0B67tS7ZIqZzQ4ga+l7IYSj2VDUSrU+gEvgISyU/ hNFpWze28OML4vguQDWN5sDLJ7bMtaHJx0rjVvlU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenwen Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 5.2 57/94] cx82310_eth: fix a memory leak bug Date: Sun, 8 Sep 2019 13:41:53 +0100 Message-Id: <20190908121152.067123010@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121150.420989666@linuxfoundation.org> References: <20190908121150.420989666@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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 5519248a791eb..32b08b18e1208 100644 --- a/drivers/net/usb/cx82310_eth.c +++ b/drivers/net/usb/cx82310_eth.c @@ -163,7 +163,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