bonding: disable netpoll on enslave failure

nikolay@redhat.com · davem330 · commit fc7a72ac86e2 · 2013-04-19T17:48:19.000-04:00
slave_disable_netpoll() is not called upon enslave failure which would
lead to a memory leak. Call slave_disable_netpoll() after err_detach as
that's the first error path after enabling netpoll on that slave.

Signed-off-by: Nikolay Aleksandrov &lt;nikolay@redhat.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
@@ -1920,6 +1920,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 		write_unlock_bh(&bond->curr_slave_lock);
 		read_unlock(&bond->lock);
 	}
+	slave_disable_netpoll(new_slave);
 
 err_close:
 	slave_dev->priv_flags &= ~IFF_BONDING;

Original file line number	Diff line number	Diff line change
`@@ -1920,6 +1920,7 @@ int bond_enslave(struct net_device bond_dev, struct net_device slave_dev)`
`1920`	`1920`	`write_unlock_bh(&bond->curr_slave_lock);`
`1921`	`1921`	`read_unlock(&bond->lock);`
`1922`	`1922`	`}`
	`1923`	`+ slave_disable_netpoll(new_slave);`
`1923`	`1924`
`1924`	`1925`	`err_close:`
`1925`	`1926`	`slave_dev->priv_flags &= ~IFF_BONDING;`