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=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 4CDB5C3A5A8 for ; Wed, 4 Sep 2019 17:59:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 238F622CF7 for ; Wed, 4 Sep 2019 17:59:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567619958; bh=+7NjyC//p62HCS/GMpm2zrlWDgcLTE7MdigH5BPT+WY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ESXFMxJ3Lwn+QUK+ma5iL1XEQhg4amrZG5WAUa/T5mhXl2/9rTACfwQTVE2LZc3cR TOieHnpJNorqpneATUGgIkPK+DiY4sx3VVDmZurxWGT/mGvUlD6ARaSdNQbRvePYlm pIaIGlYzXOxbm0Zqdvzo7u4+HqHGOhabNRG2KmH0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388216AbfIDR7R (ORCPT ); Wed, 4 Sep 2019 13:59:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:38032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387810AbfIDR7O (ORCPT ); Wed, 4 Sep 2019 13:59:14 -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 5824222CF7; Wed, 4 Sep 2019 17:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567619953; bh=+7NjyC//p62HCS/GMpm2zrlWDgcLTE7MdigH5BPT+WY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ACa7OG+sb5CUwXIZeC0U8yDMH5CVtcpp2CwOYgz0Mr6JGJZVST1ZGglV27w/AuARI X+tX1u5JTnKZMIiqoMuf5Xd/iVUT0qvKzLEZqHqvcI0V58xg3a7f8/6aZDCmwQXN80 CUeSnJ2Tc/0bIu0NMaseRoqen6bZi6+lDO5gwNxA= 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 4.9 19/83] net: cxgb3_main: Fix a resource leak in a error path in init_one() Date: Wed, 4 Sep 2019 19:53:11 +0200 Message-Id: <20190904175305.636643982@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175303.488266791@linuxfoundation.org> References: <20190904175303.488266791@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 ddd1ec8f7bd0f..d1a2159e40d6b 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -3263,7 +3263,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; @@ -3381,6 +3381,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