diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2019-04-12 15:04:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-15 22:22:09 +0200 |
| commit | 92480b3977fd3884649d404cbbaf839b70035699 (patch) | |
| tree | 3fc0c1fc92ed516b9d1b2fc04d8a733730b1348e /drivers/net/bonding | |
| parent | Revert "net-sysfs: Fix memory leak in netdev_register_kobject" (diff) | |
| download | linux-92480b3977fd3884649d404cbbaf839b70035699.tar.xz linux-92480b3977fd3884649d404cbbaf839b70035699.zip | |
bonding: fix event handling for stacked bonds
When a bond is enslaved to another bond, bond_netdev_event() only
handles the event as if the bond is a master, and skips treating the
bond as a slave.
This leads to a refcount leak on the slave, since we don't remove the
adjacency to its master and the master holds a reference on the slave.
Reproducer:
ip link add bondL type bond
ip link add bondU type bond
ip link set bondL master bondU
ip link del bondL
No "Fixes:" tag, this code is older than git history.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index b59708c35faf..ee610721098e 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3213,8 +3213,12 @@ static int bond_netdev_event(struct notifier_block *this, return NOTIFY_DONE; if (event_dev->flags & IFF_MASTER) { + int ret; + netdev_dbg(event_dev, "IFF_MASTER\n"); - return bond_master_netdev_event(event, event_dev); + ret = bond_master_netdev_event(event, event_dev); + if (ret != NOTIFY_DONE) + return ret; } if (event_dev->flags & IFF_SLAVE) { |