Commit e7868a85 authored by Jarod Wilson's avatar Jarod Wilson Committed by David S. Miller

net/core: ensure features get disabled on new lower devs

With moving netdev_sync_lower_features() after the .ndo_set_features
calls, I neglected to verify that devices added *after* a flag had been
disabled on an upper device were properly added with that flag disabled as
well. This currently happens, because we exit __netdev_update_features()
when we see dev->features == features for the upper dev. We can retain the
optimization of leaving without calling .ndo_set_features with a bit of
tweaking and a goto here.

Fixes: fd867d51 ("net/core: generic support for disabling netdev features down stack")
CC: "David S. Miller" <davem@davemloft.net>
CC: Eric Dumazet <edumazet@google.com>
CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Veaceslav Falico <vfalico@gmail.com>
CC: Andy Gospodarek <gospo@cumulusnetworks.com>
CC: Jiri Pirko <jiri@resnulli.us>
CC: Nikolay Aleksandrov <razor@blackwall.org>
CC: Michal Kubecek <mkubecek@suse.cz>
CC: Alexander Duyck <alexander.duyck@gmail.com>
CC: netdev@vger.kernel.org
Reported-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1b8d903
...@@ -6402,7 +6402,7 @@ int __netdev_update_features(struct net_device *dev) ...@@ -6402,7 +6402,7 @@ int __netdev_update_features(struct net_device *dev)
struct net_device *upper, *lower; struct net_device *upper, *lower;
netdev_features_t features; netdev_features_t features;
struct list_head *iter; struct list_head *iter;
int err = 0; int err = -1;
ASSERT_RTNL(); ASSERT_RTNL();
...@@ -6419,7 +6419,7 @@ int __netdev_update_features(struct net_device *dev) ...@@ -6419,7 +6419,7 @@ int __netdev_update_features(struct net_device *dev)
features = netdev_sync_upper_features(dev, upper, features); features = netdev_sync_upper_features(dev, upper, features);
if (dev->features == features) if (dev->features == features)
return 0; goto sync_lower;
netdev_dbg(dev, "Features changed: %pNF -> %pNF\n", netdev_dbg(dev, "Features changed: %pNF -> %pNF\n",
&dev->features, &features); &dev->features, &features);
...@@ -6434,6 +6434,7 @@ int __netdev_update_features(struct net_device *dev) ...@@ -6434,6 +6434,7 @@ int __netdev_update_features(struct net_device *dev)
return -1; return -1;
} }
sync_lower:
/* some features must be disabled on lower devices when disabled /* some features must be disabled on lower devices when disabled
* on an upper device (think: bonding master or bridge) * on an upper device (think: bonding master or bridge)
*/ */
...@@ -6443,7 +6444,7 @@ int __netdev_update_features(struct net_device *dev) ...@@ -6443,7 +6444,7 @@ int __netdev_update_features(struct net_device *dev)
if (!err) if (!err)
dev->features = features; dev->features = features;
return 1; return err < 0 ? 0 : 1;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment