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.0 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=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 7275AC43459 for ; Mon, 20 Jul 2020 15:38:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44C2022CBB for ; Mon, 20 Jul 2020 15:38:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595259518; bh=ydlCo1G7HAl66I6ZCb/yGwFyxMyR34a5z0XGSipExaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cfc8aSc8fBZLNoxZsLH0MYBz7RvtePuD4ausgYOZbp1yRI0ofHhC88gSIybb6Z7Cx x8p3dyI0hbbp3cKWQkgVj0X0I6DiTxi+3kOWEbbm/7ldqXi1/PoI1iZOnqE3wlWRtE aeFT05yiNVpqp/nvs5hqE77nzm2bGAk7ieNJ6rl4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729232AbgGTPig (ORCPT ); Mon, 20 Jul 2020 11:38:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:57146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729208AbgGTPic (ORCPT ); Mon, 20 Jul 2020 11:38:32 -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 73D5522CBE; Mon, 20 Jul 2020 15:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595259512; bh=ydlCo1G7HAl66I6ZCb/yGwFyxMyR34a5z0XGSipExaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XKGOuPr9wtkmlIvsngERxIo/SGBHbiJwQTtlthjhDhvgvWeIXnVyu3508MYC5T2d9 AX+9n64TBVYQS5Uha4xYRERuxDCdit9YuVDiblkSqX+OvJNG1BQb4113Q2gne00eCg 13pnb4+RmKbL4gB3ZnHTItG3RJwAS6uFl940y/J8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andre Edich , Parthiban Veerasooran , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 07/58] smsc95xx: avoid memory leak in smsc95xx_bind Date: Mon, 20 Jul 2020 17:36:23 +0200 Message-Id: <20200720152747.512324108@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152747.127988571@linuxfoundation.org> References: <20200720152747.127988571@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: Andre Edich [ Upstream commit 3ed58f96a70b85ef646d5427258f677f1395b62f ] In a case where the ID_REV register read is failed, the memory for a private data structure has to be freed before returning error from the function smsc95xx_bind. Fixes: bbd9f9ee69242 ("smsc95xx: add wol support for more frame types") Signed-off-by: Andre Edich Signed-off-by: Parthiban Veerasooran Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/smsc95xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 8037a2e51a789..e4299852974e3 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1142,7 +1142,8 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) /* detect device revision as different features may be available */ ret = smsc95xx_read_reg(dev, ID_REV, &val); if (ret < 0) - return ret; + goto free_pdata; + val >>= 16; if ((val == ID_REV_CHIP_ID_9500A_) || (val == ID_REV_CHIP_ID_9530_) || -- 2.25.1