| From foo@baz Sat Jun 13 09:48:35 PDT 2015 |
| From: Nicolas Dichtel <nicolas.dichtel@6wind.com> |
| Date: Wed, 13 May 2015 14:19:42 +0200 |
| Subject: rtnl/bond: don't send rtnl msg for unregistered iface |
| |
| From: Nicolas Dichtel <nicolas.dichtel@6wind.com> |
| |
| [ Upstream commit ed2a80ab7b76f11af0b2c6255709c4ebf164b667 ] |
| |
| 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: d4261e565000 ("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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/bonding/bond_options.c | 2 +- |
| net/core/rtnetlink.c | 3 +++ |
| 2 files changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/bonding/bond_options.c |
| +++ b/drivers/net/bonding/bond_options.c |
| @@ -624,7 +624,7 @@ int __bond_opt_set(struct bonding *bond, |
| out: |
| if (ret) |
| bond_opt_error_interpret(bond, opt, ret, val); |
| - else |
| + else if (bond->dev->reg_state == NETREG_REGISTERED) |
| call_netdevice_notifiers(NETDEV_CHANGEINFODATA, bond->dev); |
| |
| return ret; |
| --- a/net/core/rtnetlink.c |
| +++ b/net/core/rtnetlink.c |
| @@ -2337,6 +2337,9 @@ void rtmsg_ifinfo(int type, struct net_d |
| { |
| struct sk_buff *skb; |
| |
| + if (dev->reg_state != NETREG_REGISTERED) |
| + return; |
| + |
| skb = rtmsg_ifinfo_build_skb(type, dev, change, flags); |
| if (skb) |
| rtmsg_ifinfo_send(skb, dev, flags); |