Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp5231176ybl; Tue, 27 Aug 2019 01:12:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqyphRHmjKwuxgEytNXNT5oap0NVYm31N+chpw6kjIzRHCvS65DiUIRrywfUShyjuNPo4hGT X-Received: by 2002:aa7:8647:: with SMTP id a7mr23664255pfo.119.1566893554012; Tue, 27 Aug 2019 01:12:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566893554; cv=none; d=google.com; s=arc-20160816; b=tkxnpqHgKzGtS7tJWscNjjfMLjforBSf5XF75cLBgTneKRbYAn16ZLALt220ZmzI9i /fc90gO67aCzwmWG61Z826wLy6iGvt81jwTPda+p2c+Fi9Mx5f/kIAiHgMiURUSLMcMK uprmheafJ9gIlS7XUh4ggM2zwGasExxOZwdBIa6E6KF0cTTo+KsZM3/zI5i6QN9MZnSi iV7u1HiB8YKX2wVXCgTXnMfBj2Rh5a6MSIkRYK3NYb/y57qwde63PxqTxNqHSIBBCWNf wDnax2unl0tEj8ohdeYqqmlhBACnpbWGPhOVkxLVAZa3uocRLTViB9eluicRkT4kLVhw jv6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hNyi+iMlPhT5qf+1LIwjLo3n8fvNq31EMYMBzrGGAPc=; b=kMgJ/cVw98kSvcYlGGx8maSWeemYdq961co4hL+/1BanBE3o2HEr7iUkwE5sLnTTXI 2JEpedYc8bjxrt3HM/4MyPVDupKEIJR9otJcMxOKj+dWIwMabk3+27QZ2HFziJjiKRtH 9RNBEgwe6WQXuT6k+23OKFPhmBvf+mT661WdhIYg+Q8qSnfnvvpFYv9rW+FT3NkLSpd5 m7NEj2oKxhZMEUZc0MoP+Y8j4+50d5HMgFzdjUza9kEdkj66CfGeQwacamkySB2wzQ/z ArGpGn7Kbauky7BSaC66gmZClHpAtnkBwHBmZoiipMZa/Pq8y+gm1WBhjbakb3Mfgknp XeXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KwAGke2z; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q15si11083352pgt.150.2019.08.27.01.12.18; Tue, 27 Aug 2019 01:12:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KwAGke2z; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728571AbfH0IDi (ORCPT + 99 others); Tue, 27 Aug 2019 04:03:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:60994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732276AbfH0IDe (ORCPT ); Tue, 27 Aug 2019 04:03:34 -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 8F9A02189D; Tue, 27 Aug 2019 08:03:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566893013; bh=1KOunPuokLRF00R6WfX4KEPxteQidVVs3eZ39euy99g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KwAGke2zL7txTPRquX/ew/RqZ7VMfCuNxzx4aQnFm17pCrRHQb4jV6jKyeJ7R4DBq gXpu838n5GzM1g3CF+RKe7EIx+vFKXqJ8kQC8UTp1JvRDmrwRoD8ULD5dQUdwo58Z7 zSw1bUjmBZjz/JMNb3ddd/i0DvryPuOnf+y79SKo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , "David S. Miller" , Sasha Levin Subject: [PATCH 5.2 089/162] net: cxgb3_main: Fix a resource leak in a error path in init_one() Date: Tue, 27 Aug 2019 09:50:17 +0200 Message-Id: <20190827072741.255456016@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827072738.093683223@linuxfoundation.org> References: <20190827072738.093683223@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 [ Upstream commit debea2cd3193ac868289e8893c3a719c265b0612 ] A call to 'kfree_skb()' is missing in the error handling path of 'init_one()'. This is already present in 'remove_one()' but is missing here. Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 1e82b9efe4471..58f89f6a040fe 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -3269,7 +3269,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (!adapter->regs) { dev_err(&pdev->dev, "cannot map device registers\n"); err = -ENOMEM; - goto out_free_adapter; + goto out_free_adapter_nofail; } adapter->pdev = pdev; @@ -3397,6 +3397,9 @@ out_free_dev: if (adapter->port[i]) free_netdev(adapter->port[i]); +out_free_adapter_nofail: + kfree_skb(adapter->nofail_skb); + out_free_adapter: kfree(adapter); -- 2.20.1