p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rtnl/bond: don't send rtnl msg for unregistered iface 

Before the patch, the command 'ip link add bond2 type bond mode 802.3ad'
causes the kernel to send a rtnl message for the bond2 interface, with an
ifindex 0.

'ip monitor' shows:
0: bond2: <BROADCAST,MULTICAST,MASTER> mtu 1500 state DOWN group default
    link/ether 00:00:00:00:00:00 brd ff:ff:ff:ff:ff:ff
9: bond2@NONE: <BROADCAST,MULTICAST,MASTER> mtu 1500 qdisc noop state DOWN group default
    link/ether ea:3e:1f:53:92:7b brd ff:ff:ff:ff:ff:ff
[snip]

The patch fixes the spotted bug by checking in bond driver if the interface
is registered before calling the notifier chain.
It also adds a check in rtmsg_ifinfo() to prevent this kind of bug in the
future.

Fixes: d4261e5650 ("bonding: create netlink event when bonding option is changed")
CC: Jiri Pirko <jiri@resnulli.us>
Reported-by: Julien Meunier <julien.meunier@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Dichtel 2015-05-13 14:19:42 +02:00 committed by David S. Miller
parent 07ee0722bf
commit ed2a80ab7b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/bonding/bond_options.c
View File

@ -624,7 +624,7 @@ int __bond_opt_set(struct bonding *bond,
out: out:
if (ret) if (ret)
bond_opt_error_interpret(bond, opt, ret, val); bond_opt_error_interpret(bond, opt, ret, val);
else else if (bond->dev->reg_state == NETREG_REGISTERED)
call_netdevice_notifiers(NETDEV_CHANGEINFODATA, bond->dev); call_netdevice_notifiers(NETDEV_CHANGEINFODATA, bond->dev);
return ret; return ret;

3
net/core/rtnetlink.c
View File

@ -2416,6 +2416,9 @@ void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change,
{ {
struct sk_buff *skb; struct sk_buff *skb;
if (dev->reg_state != NETREG_REGISTERED)
return;
skb = rtmsg_ifinfo_build_skb(type, dev, change, flags); skb = rtmsg_ifinfo_build_skb(type, dev, change, flags);
if (skb) if (skb)
rtmsg_ifinfo_send(skb, dev, flags); rtmsg_ifinfo_send(skb, dev, flags);