Skip to content

Commit e8238fc

Browse files
liuhangbindavem330
authored andcommitted
bridge: check iface upper dev when setting master via ioctl
When we set a bond slave's master to bridge via ioctl, we only check the IFF_BRIDGE_PORT flag. Although we will find the slave's real master at netdev_master_upper_dev_link() later, it already does some settings and allocates some resources. It would be better to return as early as possible. v1 -> v2: use netdev_master_upper_dev_get() instead of netdev_has_any_upper_dev() to check if we have a master, because not all upper devs are masters, e.g. vlan device. Reported-by: [email protected] Signed-off-by: Hangbin Liu <[email protected]> Acked-by: Nikolay Aleksandrov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1d39fd1 commit e8238fc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/bridge/br_if.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,
518518
return -ELOOP;
519519
}
520520

521-
/* Device is already being bridged */
522-
if (br_port_exists(dev))
521+
/* Device has master upper dev */
522+
if (netdev_master_upper_dev_get(dev))
523523
return -EBUSY;
524524

525525
/* No bridging devices that dislike that (e.g. wireless) */

0 commit comments

Comments
 (0)