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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 C40ACC2D0E8 for ; Tue, 31 Mar 2020 09:12:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9126520675 for ; Tue, 31 Mar 2020 09:12:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645957; bh=O5xXngZRzBqwgoGToi4jFN4iln4s0ii6lgq5QChT0rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qmpfrCc5IQzNqMJJowRCeWpOwKwiWiFO9aGSiDzRKNa90MV6vWR0qG4/+OTt7SJjK TKCyFsbEV2YKoZ3GUccwA5qRc2Le1gQlitZ4fj/CyWQOy9Crznny6a/56LU3CTqgr3 SLXioKF8tVYEqNoCabOvQ4vmpuwnMCucjtd2L800= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731777AbgCaJMg (ORCPT ); Tue, 31 Mar 2020 05:12:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:59266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731249AbgCaJMf (ORCPT ); Tue, 31 Mar 2020 05:12:35 -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 D0BB520772; Tue, 31 Mar 2020 09:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645955; bh=O5xXngZRzBqwgoGToi4jFN4iln4s0ii6lgq5QChT0rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iOppGD/NqGiz0v35RlPr0A0qQ8csWhUdgb538ubyxu1IjllcQC25v7M9PP/V9A9bo 0XKWcabWsNzqRR5XOhk20hdyMSmV/4dOSY954en6z/9i9E2Hx4h8MlIT1PuvXv2Ayk kqpBNaGBKmOkS83Hy4v6/ZmPP4W0Wiq1hW8btTGA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Chan , "David S. Miller" Subject: [PATCH 5.4 042/155] bnxt_en: Free context memory after disabling PCI in probe error path. Date: Tue, 31 Mar 2020 10:58:02 +0200 Message-Id: <20200331085423.126844947@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331085418.274292403@linuxfoundation.org> References: <20200331085418.274292403@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michael Chan [ Upstream commit 62bfb932a51f6d08eb409248e69f8d6428c2cabd ] Other shutdown code paths will always disable PCI first to shutdown DMA before freeing context memory. Do the same sequence in the error path of probe to be safe and consistent. Fixes: c20dc142dd7b ("bnxt_en: Disable bus master during PCI shutdown and driver unload.") Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -11895,12 +11895,12 @@ init_err_cleanup: init_err_pci_clean: bnxt_free_hwrm_short_cmd_req(bp); bnxt_free_hwrm_resources(bp); - bnxt_free_ctx_mem(bp); - kfree(bp->ctx); - bp->ctx = NULL; kfree(bp->fw_health); bp->fw_health = NULL; bnxt_cleanup_pci(bp); + bnxt_free_ctx_mem(bp); + kfree(bp->ctx); + bp->ctx = NULL; init_err_free: free_netdev(dev);