Messages in this thread Patch in this message | | | From | Matteo Croce <> | Subject | [PATCH net-next] bonding: don't init workqueues on error | Date | Tue, 10 Dec 2019 16:24:54 +0100 |
| |
bond_create() initialize six workqueues used later on. In the unlikely event that the device registration fails, these structures are initialized unnecessarily, so move the initialization out of the error path. Also, create an error label to remove some duplicated code.
Signed-off-by: Matteo Croce <mcroce@redhat.com> --- drivers/net/bonding/bond_main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index fcb7c2f7f001..8756b6a023d7 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4889,8 +4889,8 @@ int bond_create(struct net *net, const char *name) bond_setup, tx_queues); if (!bond_dev) { pr_err("%s: eek! can't alloc netdev!\n", name); - rtnl_unlock(); - return -ENOMEM; + res = -ENOMEM; + goto out_unlock; } /* @@ -4905,14 +4905,17 @@ int bond_create(struct net *net, const char *name) bond_dev->rtnl_link_ops = &bond_link_ops; res = register_netdevice(bond_dev); + if (res < 0) { + free_netdev(bond_dev); + goto out_unlock; + } netif_carrier_off(bond_dev); bond_work_init_all(bond); +out_unlock: rtnl_unlock(); - if (res < 0) - free_netdev(bond_dev); return res; } -- 2.23.0
| |