From patchwork Fri Jul 3 13:25:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Edich X-Patchwork-Id: 1322378 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=NyT+PZTj; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ywhH1P2zz9sTF for ; Fri, 3 Jul 2020 23:25:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726361AbgGCNZt (ORCPT ); Fri, 3 Jul 2020 09:25:49 -0400 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:46299 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726022AbgGCNZt (ORCPT ); Fri, 3 Jul 2020 09:25:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593782748; x=1625318748; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aXH7cCcyLAfZIki7F52vHIfuToOqAN4pwM7AwEcDW+I=; b=NyT+PZTjIGutLprJj5GHgsE6cR1SoZtXDMVOh5JI3LsvsPq5L3j5stBk VA2zCRSt+cxJUtfvagyld5jyCqWMclK/Xfg8103ZIWYvJtFiKaOoHdFyF UhjqEWASkKgNwevDr65UGIst8J03XEZhQug3Zula+zSXeI6ffyqvZ/adQ RoOAORJcuqlbdbGJj9eKKuocIUNdapXjV0G5Y2EWpbmcEe/BbbTB5Zfps JhLwRR62/+i+YdVTx9eqG5WzS88LrJdq6bAgM29nDgioUjYFAfg1JkFVr /QtyuSPRbnSuiCBCVF4g/NYlbXCFloiJvBN24R5mYZk38xTkT8Jsg+X6x g==; IronPort-SDR: 4Lcsp5cbFIRD+dbK1IMgKZ+XMjzuirKxDBUUYy/dIvm6fW7QwYYhnX5XQoL8duaEMfpsE71xRm /6Azscd1Kvj8pS6FJc3btOzFRLHW/Do5ewkRWvZ3Q1JfZsbJML8hz/x4nmsN/3WdGWn6zBwLmt 9MfMwXFIt+cLwjey0NSCL4WUJVcSnUUwtPv0EWP+9OSb6wNpVzVQ074fr27BKcj6xcaWWyLNgf q7yubHBfeZ4Yv3oFkRQ7urVseAR4qi2WUn7efJFwQIpoPSTEQBzx+PT6dLg2OkcsqqlDZ/44lS 0xo= X-IronPort-AV: E=Sophos;i="5.75,308,1589266800"; d="scan'208";a="86143875" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 03 Jul 2020 06:25:48 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Fri, 3 Jul 2020 06:25:47 -0700 Received: from xasv.mchp-main.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Fri, 3 Jul 2020 06:25:45 -0700 From: Andre Edich To: , , CC: , Andre Edich Subject: [PATCH net 1/2] smsc95xx: check return value of smsc95xx_reset Date: Fri, 3 Jul 2020 15:25:05 +0200 Message-ID: <20200703132506.12359-2-andre.edich@microchip.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200703132506.12359-1-andre.edich@microchip.com> References: <20200703132506.12359-1-andre.edich@microchip.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The return value of the function smsc95xx_reset() must be checked to avoid returning false success from the function smsc95xx_bind(). Signed-off-by: Andre Edich Signed-off-by: Parthiban Veerasooran --- drivers/net/usb/smsc95xx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 3cf4dc3433f9..eb404bb74e18 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1287,6 +1287,8 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) /* Init all registers */ ret = smsc95xx_reset(dev); + if (ret) + goto free_pdata; /* detect device revision as different features may be available */ ret = smsc95xx_read_reg(dev, ID_REV, &val); @@ -1317,6 +1319,10 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) schedule_delayed_work(&pdata->carrier_check, CARRIER_CHECK_DELAY); return 0; + +free_pdata: + kfree(pdata); + return ret; } static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf) From patchwork Fri Jul 3 13:25:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Edich X-Patchwork-Id: 1322379 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=q2KrC9g7; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49ywjD3H2Xz9sR4 for ; Fri, 3 Jul 2020 23:26:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726416AbgGCN0i (ORCPT ); Fri, 3 Jul 2020 09:26:38 -0400 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:63639 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726098AbgGCN0i (ORCPT ); Fri, 3 Jul 2020 09:26:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593782797; x=1625318797; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M/8OjpxBXA9Df1qwOeMkq4s3kPhfdX6fyC5NjM9SefM=; b=q2KrC9g7V59+JLBTP0IR3rfj+KJsRqHC+Pl5Ed39xEAS027NPMkxY9Iw /btnVGNn76WNIDwTD9vPih5mSk/8IyUdKwhY9VzBL7CEGi+ixHRIRZnGu g8CkLMJehHTF5ekGU4TMwU43X2IbMRVc9VrK614q/IhfXWzEqIgT4PaHV fwNMQRBNlO3gzj3jV3gE5K3cb+9fTNA2SNnfhmV1oqw10AJ5TjgpbOoVs RNTloAVNJNQYzs9ftqrsrsRxugYDNZB+01apj8Hl8LleZt3iSOiuLTkWb r/WzHVA2ReCZMcstGQHkjU9Udmosqu5a8KGVDJARBZsfyRe5NbDCEYlwY w==; IronPort-SDR: wCWy2eXfDKFmOSZ72crT8FfKCRtUp0enFIlaCFbxnF58flmiHWF1Vp2cYV6h55vgVWwOdFY/PH jc+2TwYBzSO65QxDiHHvzoCuy8f9dEu9q55+bzNGGwh2wI/G1vUD0V3BcFPwKTpjAFWMjfJFib DeyT2l8bLZmoXJlUwPN0GWv9qImHB3WbHCXIGJWTFOyihKM3mWbDQADDTBZ27U61+6Bzouueou cxfYHdScsdF/xdYVw7WLODG0ObwXoInYRqcuN3dnP7jwJKF2350OJghnjtiZOfbXXuM6FZ/ent tQ0= X-IronPort-AV: E=Sophos;i="5.75,308,1589266800"; d="scan'208";a="80631894" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 03 Jul 2020 06:26:37 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Fri, 3 Jul 2020 06:26:15 -0700 Received: from xasv.mchp-main.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Fri, 3 Jul 2020 06:26:35 -0700 From: Andre Edich To: , , CC: , Andre Edich Subject: [PATCH net 2/2] smsc95xx: avoid memory leak in smsc95xx_bind Date: Fri, 3 Jul 2020 15:25:06 +0200 Message-ID: <20200703132506.12359-3-andre.edich@microchip.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200703132506.12359-1-andre.edich@microchip.com> References: <20200703132506.12359-1-andre.edich@microchip.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. Signed-off-by: Andre Edich Signed-off-by: Parthiban Veerasooran --- 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 eb404bb74e18..bb4ccbda031a 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1293,7 +1293,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; pdata->chip_id = val; pdata->mdix_ctrl = get_mdix_status(dev->net);