From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from imap1.codethink.co.uk ([176.9.8.82]:48163 "EHLO
        imap1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1754256AbeFQXGX (ORCPT
        <rfc822;stable@vger.kernel.org>); Sun, 17 Jun 2018 19:06:23 -0400
Message-ID: <1529276779.2289.243.camel@codethink.co.uk>
Subject: Re: [PATCH 4.4 234/268] enic: enable rq before updating rq
 descriptors
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
To: Govindarajulu Varadarajan <gvaradar@cisco.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: Mon, 18 Jun 2018 00:06:19 +0100
In-Reply-To: <20180528100229.860636552@linuxfoundation.org>
References: <20180528100202.045206534@linuxfoundation.org>
         <20180528100229.860636552@linuxfoundation.org>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Mon, 2018-05-28 at 12:03 +0200, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: Govindarajulu Varadarajan <gvaradar@cisco.com>
> 
> [ Upstream commit e8588e268509292550634d9a35f2723a207683b2 ]
[...]
> --- a/drivers/net/ethernet/cisco/enic/enic_main.c
> +++ b/drivers/net/ethernet/cisco/enic/enic_main.c
[...]
> @@ -1765,8 +1765,12 @@ static int enic_open(struct net_device *
> >  	return 0;
>  
>  err_out_free_rq:
> -	for (i = 0; i < enic->rq_count; i++)
> +	for (i = 0; i < enic->rq_count; i++) {
> +		err = vnic_rq_disable(&enic->rq[i]);
> +		if (err)
> +			return err;

This added code is wrong: it overwrites the error code that was
previously in err.  If vnic_rq_disable() succeeds, enic_open() will
wrongly return 0.  If vnic_rq_disable() fails, I still don't think it
makes sense to skip the remaining cleanup actins.

Ben.

>  		vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
> +	}
>  	enic_dev_notify_unset(enic);
>  err_out_free_intr:
>  	enic_unset_affinity_hint(enic);
> 
> 
> 
-- 
Ben Hutchings, Software Developer                         Codethink Ltd
https://www.codethink.co.uk/                 Dale House, 35 Dale Street
                                     Manchester, M1 2HF, United Kingdom