| From 32c8c966e84d2beefaa2a34f913214c6a4be023f Mon Sep 17 00:00:00 2001 |
| From: Vasily Averin <vvs@virtuozzo.com> |
| Date: Tue, 2 Jun 2020 15:55:26 +0300 |
| Subject: [PATCH] net_failover: fixed rollback in net_failover_open() |
| |
| commit e8224bfe77293494626f6eec1884fee7b87d0ced upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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.27.0 |
| |
