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,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 A9847C3A59F for ; Thu, 29 Aug 2019 18:17:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 792E523427 for ; Thu, 29 Aug 2019 18:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102647; bh=+U5HirJGTP3ZwwZJMoDz46k/1ztwOH1HhXDyighwXZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KXyqDLGc+JL7GZzRKASX+7m1KLxibwZE7xMp3Mcsi8SAMv2gpJXsEeweXYMcHt6/2 ZRmINN7x2VFNvpp4LuqBGq8apEjC8P1htDI6JjbsIjYhv+kE3Rl2Ivro1kTNEnHIW+ zV47RskFPyQ/TGqIKaLL92AI6RWANOjFITWs5UjQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729248AbfH2SR0 (ORCPT ); Thu, 29 Aug 2019 14:17:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:59404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729217AbfH2SRO (ORCPT ); Thu, 29 Aug 2019 14:17:14 -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 78A542339E; Thu, 29 Aug 2019 18:17:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102633; bh=+U5HirJGTP3ZwwZJMoDz46k/1ztwOH1HhXDyighwXZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jMHkzoWu0KfOKnY71tSFv9xiGKFKeO24Z8eSbDH1+cktUr3FPyd0CnGdy3jO7P+fp nNb6FBzG/+i8IEHqCve1OAjzq6ts38GCYrTdVZ85UxHUNaXQYo0RY96GE3LHns9YFO HHBdjeTfKIQcP0VnFa2OyKcJqagfb19Gs/CRRQYs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenwen Wang , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 13/27] lan78xx: Fix memory leaks Date: Thu, 29 Aug 2019 14:16:39 -0400 Message-Id: <20190829181655.8741-13-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190829181655.8741-1-sashal@kernel.org> References: <20190829181655.8741-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wenwen Wang [ Upstream commit b9cbf8a64865b50fd0f4a3915fa00ac7365cdf8f ] In lan78xx_probe(), a new urb is allocated through usb_alloc_urb() and saved to 'dev->urb_intr'. However, in the following execution, if an error occurs, 'dev->urb_intr' is not deallocated, leading to memory leaks. To fix this issue, invoke usb_free_urb() to free the allocated urb before returning from the function. Signed-off-by: Wenwen Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/lan78xx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index b62c41114e34e..24b994c68bccd 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -3645,7 +3645,7 @@ static int lan78xx_probe(struct usb_interface *intf, ret = register_netdev(netdev); if (ret != 0) { netif_err(dev, probe, netdev, "couldn't register the device\n"); - goto out3; + goto out4; } usb_set_intfdata(intf, dev); @@ -3660,12 +3660,14 @@ static int lan78xx_probe(struct usb_interface *intf, ret = lan78xx_phy_init(dev); if (ret < 0) - goto out4; + goto out5; return 0; -out4: +out5: unregister_netdev(netdev); +out4: + usb_free_urb(dev->urb_intr); out3: lan78xx_unbind(dev, intf); out2: -- 2.20.1