diff options
| author | Loic Prylli <loicp@google.com> | 2014-07-01 21:39:43 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-07-29 17:01:05 +0200 |
| commit | 4c824ea2e6272f897012dacbced560b9aa11fd46 (patch) | |
| tree | d313d95aeb493e94bd1552716b749e56e2894a46 /net | |
| parent | 196162dec88329f9ea8c7a1cd4d4b709541d645f (diff) | |
net: Fix NETDEV_CHANGE notifier usage causing spurious arp flush
[ Upstream commit 54951194656e4853e441266fd095f880bc0398f3 ]
A bug was introduced in NETDEV_CHANGE notifier sequence causing the
arp table to be sometimes spuriously cleared (including manual arp
entries marked permanent), upon network link carrier changes.
The changed argument for the notifier was applied only to a single
caller of NETDEV_CHANGE, missing among others netdev_state_change().
So upon net_carrier events induced by the network, which are
triggering a call to netdev_state_change(), arp_netdev_event() would
decide whether to clear or not arp cache based on random/junk stack
values (a kind of read buffer overflow).
Fixes: be9efd365328 ("net: pass changed flags along with NETDEV_CHANGE event")
Fixes: 6c8b4e3ff81b ("arp: flush arp cache on IFF_NOARP change")
Signed-off-by: Loic Prylli <loicp@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 704c0c5bed1f..ef2f239cc322 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1202,7 +1202,11 @@ EXPORT_SYMBOL(netdev_features_change); void netdev_state_change(struct net_device *dev) { if (dev->flags & IFF_UP) { - call_netdevice_notifiers(NETDEV_CHANGE, dev); + struct netdev_notifier_change_info change_info; + + change_info.flags_changed = 0; + call_netdevice_notifiers_info(NETDEV_CHANGE, dev, + &change_info.info); rtmsg_ifinfo(RTM_NEWLINK, dev, 0); } } |