diff mbox series

net_failover: fixed rollback in net_failover_open()

Message ID df2d392b-0713-20b8-0deb-1a9f93f7a9c2@virtuozzo.com
State Accepted
Delegated to: David Miller
Headers show
Series net_failover: fixed rollback in net_failover_open() | expand

Commit Message

Vasily Averin June 2, 2020, 12:55 p.m. UTC
found by smatch:
drivers/net/net_failover.c:65 net_failover_open() error:
 we previously assumed 'primary_dev' could be null (see line 43)

cc: stable@vger.kernel.org
Fixes: cfc80d9a1163 ("net: Introduce net_failover driver")
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
 drivers/net/net_failover.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

David Miller June 2, 2020, 10:36 p.m. UTC | #1
From: Vasily Averin <vvs@virtuozzo.com>
Date: Tue, 2 Jun 2020 15:55:26 +0300

> found by smatch:
> drivers/net/net_failover.c:65 net_failover_open() error:
>  we previously assumed 'primary_dev' could be null (see line 43)
> 
> cc: stable@vger.kernel.org
> Fixes: cfc80d9a1163 ("net: Introduce net_failover driver")
> Signed-off-by: Vasily Averin <vvs@virtuozzo.com>

Do not CC: stable for networking patches in the future please.

Applied, and queued up for -stable, thanks.
diff mbox series

Patch

diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
index b16a122..fb182be 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;