]>
Commit | Line | Data |
---|---|---|
d55578af GKH |
1 | From foo@baz Wed May 16 16:57:32 CEST 2018 |
2 | From: Hangbin Liu <liuhangbin@gmail.com> | |
3 | Date: Fri, 27 Apr 2018 20:59:24 +0800 | |
4 | Subject: bridge: check iface upper dev when setting master via ioctl | |
5 | ||
6 | From: Hangbin Liu <liuhangbin@gmail.com> | |
7 | ||
8 | [ Upstream commit e8238fc2bd7b4c3c7554fa2df067e796610212fc ] | |
9 | ||
10 | When we set a bond slave's master to bridge via ioctl, we only check | |
11 | the IFF_BRIDGE_PORT flag. Although we will find the slave's real master | |
12 | at netdev_master_upper_dev_link() later, it already does some settings | |
13 | and allocates some resources. It would be better to return as early | |
14 | as possible. | |
15 | ||
16 | v1 -> v2: | |
17 | use netdev_master_upper_dev_get() instead of netdev_has_any_upper_dev() | |
18 | to check if we have a master, because not all upper devs are masters, | |
19 | e.g. vlan device. | |
20 | ||
21 | Reported-by: syzbot+de73361ee4971b6e6f75@syzkaller.appspotmail.com | |
22 | Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> | |
23 | Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | |
24 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
25 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
26 | --- | |
27 | net/bridge/br_if.c | 4 ++-- | |
28 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
29 | ||
30 | --- a/net/bridge/br_if.c | |
31 | +++ b/net/bridge/br_if.c | |
32 | @@ -456,8 +456,8 @@ int br_add_if(struct net_bridge *br, str | |
33 | if (dev->netdev_ops->ndo_start_xmit == br_dev_xmit) | |
34 | return -ELOOP; | |
35 | ||
36 | - /* Device is already being bridged */ | |
37 | - if (br_port_exists(dev)) | |
38 | + /* Device has master upper dev */ | |
39 | + if (netdev_master_upper_dev_get(dev)) | |
40 | return -EBUSY; | |
41 | ||
42 | /* No bridging devices that dislike that (e.g. wireless) */ |