summaryrefslogtreecommitdiff
path: root/drivers/net/net_failover.c
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2018-09-04 02:56:26 +0000
committerDavid S. Miller <davem@davemloft.net>2018-09-05 22:14:47 -0700
commit9e7e6cabf371cc008cb2244a04c012b516753693 (patch)
tree78fdf499b85e1e37860655fbb34c2df2b738a2b0 /drivers/net/net_failover.c
parent428f944bd58607021b5a1f85d145c0b50f908c6f (diff)
failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister
Fixes gcc '-Wunused-but-set-variable' warning: drivers/net/net_failover.c: In function 'net_failover_slave_unregister': drivers/net/net_failover.c:598:35: warning: variable 'primary_dev' set but not used [-Wunused-but-set-variable] There should check the validity of 'slave_dev'. Fixes: cfc80d9a1163 ("net: Introduce net_failover driver") Signed-off-by: YueHaibing <yuehaibing@huawei.com> Acked-by: Sridhar Samudrala <sridhar.samudrala@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/net_failover.c')
-rw-r--r--drivers/net/net_failover.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
index 192ae1cd17f0..8524fe4fddea 100644
--- a/drivers/net/net_failover.c
+++ b/drivers/net/net_failover.c
@@ -602,6 +602,9 @@ static int net_failover_slave_unregister(struct net_device *slave_dev,
primary_dev = rtnl_dereference(nfo_info->primary_dev);
standby_dev = rtnl_dereference(nfo_info->standby_dev);
+ if (WARN_ON_ONCE(slave_dev != primary_dev && slave_dev != standby_dev))
+ return -ENODEV;
+
vlan_vids_del_by_dev(slave_dev, failover_dev);
dev_uc_unsync(slave_dev, failover_dev);
dev_mc_unsync(slave_dev, failover_dev);