FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-15 21:30:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bond: Get the rtnl_link_ops support correct

Browse Source 
- Don't call rtnl_link_unregister if rtnl_link_register fails
- Set .priv_size so we aren't stomping on uninitialized memory
  when we use netdev_priv, on bond devices created with
  ip link add type bond.

Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric W. Biederman 2009-10-29 23:58:54 +00:00 committed by David S. Miller
parent ec87fd3b4e
commit 6639104bd8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/bonding/bond_main.c
View File

@ -5056,6 +5056,7 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
static struct rtnl_link_ops bond_link_ops __read_mostly = { static struct rtnl_link_ops bond_link_ops __read_mostly = {
.kind = "bond", .kind = "bond",
.priv_size = sizeof(struct bonding),
.setup = bond_setup, .setup = bond_setup,
.validate = bond_validate, .validate = bond_validate,
}; };
@ -5157,7 +5158,7 @@ static int __init bonding_init(void)
res = rtnl_link_register(&bond_link_ops); res = rtnl_link_register(&bond_link_ops);
if (res) if (res)
goto err; goto err_link;
for (i = 0; i < max_bonds; i++) { for (i = 0; i < max_bonds; i++) {
res = bond_create(&init_net, NULL); res = bond_create(&init_net, NULL);
@ -5176,6 +5177,7 @@ out:
return res; return res;
err: err:
rtnl_link_unregister(&bond_link_ops); rtnl_link_unregister(&bond_link_ops);
err_link:
unregister_pernet_gen_subsys(bond_net_id, &bond_net_ops); unregister_pernet_gen_subsys(bond_net_id, &bond_net_ops);
goto out; goto out;