lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 272/274] net_failover: fixed rollback in net_failover_open()
    Date
    From: Vasily Averin <vvs@virtuozzo.com>

    [ Upstream commit e8224bfe77293494626f6eec1884fee7b87d0ced ]

    found by smatch:
    drivers/net/net_failover.c:65 net_failover_open() error:
    we previously assumed 'primary_dev' could be null (see line 43)

    Fixes: cfc80d9a1163 ("net: Introduce net_failover driver")
    Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/net_failover.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
    index b16a1221d19b..fb182bec8f06 100644
    --- a/drivers/net/net_failover.c
    +++ b/drivers/net/net_failover.c
    @@ -61,7 +61,8 @@ static int net_failover_open(struct net_device *dev)
    return 0;

    err_standby_open:
    - dev_close(primary_dev);
    + if (primary_dev)
    + dev_close(primary_dev);
    err_primary_open:
    netif_tx_disable(dev);
    return err;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:44    [W:3.622 / U:0.856 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site