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;
Message-ID: <1536696866.3024.151.camel@codethink.co.uk>
Subject: Re: [PATCH 4.4 51/79] bnxt_en: Fix for system hang if request_irq
 fails
From:   Ben Hutchings <ben.hutchings@codethink.co.uk>
To:     Vikas Gupta <vikas.gupta@broadcom.com>,
        Michael Chan <michael.chan@broadcom.com>
Cc:     stable@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
        Sasha Levin <alexander.levin@microsoft.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        LKML <linux-kernel@vger.kernel.org>
Date:   Tue, 11 Sep 2018 21:14:26 +0100
In-Reply-To: <20180823074922.442947994@linuxfoundation.org>
References: <20180823074918.641878835@linuxfoundation.org>
         <20180823074922.442947994@linuxfoundation.org>
Organization: Codethink Ltd.
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Thu, 2018-08-23 at 09:53 +0200, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: Vikas Gupta <vikas.gupta@broadcom.com>
> 
> [ Upstream commit c58387ab1614f6d7fb9e244f214b61e7631421fc ]
> 
> Fix bug in the error code path when bnxt_request_irq() returns failure.
> bnxt_disable_napi() should not be called in this error path because
> NAPI has not been enabled yet.
[...]
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> @@ -4591,7 +4591,7 @@ static int __bnxt_open_nic(struct bnxt *
>  		rc = bnxt_request_irq(bp);
>  		if (rc) {
>  			netdev_err(bp->dev, "bnxt_request_irq err: %x\n", rc);
> -			goto open_err;
> +			goto open_err_irq;
>  		}
>  	}
>  
> @@ -4629,6 +4629,8 @@ static int __bnxt_open_nic(struct bnxt *
>  
>  open_err:
>  	bnxt_disable_napi(bp);
> +
> +open_err_irq:
>  	bnxt_del_napi(bp);

Shouldn't this added statement be conditional on irq_re_init?

Ben.

>  
>  open_err_free_mem:

-- 
Ben Hutchings, Software Developer                         Codethink Ltd
https://www.codethink.co.uk/                 Dale House, 35 Dale Street
                                     Manchester, M1 2HF, United Kingdom