lkml.org 
[lkml]   [2018]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.17 053/101] enic: do not overwrite error code
    Date
    4.17-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Govindarajulu Varadarajan <gvaradar@cisco.com>

    [ Upstream commit 56f772279a762984f6e9ebbf24a7c829faba5712 ]

    In failure path, we overwrite err to what vnic_rq_disable() returns. In
    case it returns 0, enic_open() returns success in case of error.

    Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
    Fixes: e8588e268509 ("enic: enable rq before updating rq descriptors")
    Signed-off-by: Govindarajulu Varadarajan <gvaradar@cisco.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/cisco/enic/enic_main.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    --- a/drivers/net/ethernet/cisco/enic/enic_main.c
    +++ b/drivers/net/ethernet/cisco/enic/enic_main.c
    @@ -1920,7 +1920,7 @@ static int enic_open(struct net_device *
    {
    struct enic *enic = netdev_priv(netdev);
    unsigned int i;
    - int err;
    + int err, ret;

    err = enic_request_intr(enic);
    if (err) {
    @@ -1977,10 +1977,9 @@ static int enic_open(struct net_device *

    err_out_free_rq:
    for (i = 0; i < enic->rq_count; i++) {
    - err = vnic_rq_disable(&enic->rq[i]);
    - if (err)
    - return err;
    - vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
    + ret = vnic_rq_disable(&enic->rq[i]);
    + if (!ret)
    + vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
    }
    enic_dev_notify_unset(enic);
    err_out_free_intr:

    \
     
     \ /
      Last update: 2018-07-20 14:45    [W:4.144 / U:0.492 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site