leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NET]: Call uninit if necessary in register_netdevice

Browse Source 
This patch makes register_netdevice call dev->uninit if the regsitration
fails after dev->init has completed successfully.  Very few drivers use
the init/uninit calls but at least one (drivers/net/wan/sealevel.c) may
leak without this change.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2007-07-30 16:29:40 -07:00 committed by David S. Miller
parent ccc7911fbd
commit 7ce1b0edcb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/core/dev.c
View File

@ -3337,7 +3337,7 @@ int register_netdevice(struct net_device *dev)
if (!dev_valid_name(dev->name)) {
ret = -EINVAL;
goto out;
goto err_uninit;
}
dev->ifindex = dev_new_index();
@ -3351,7 +3351,7 @@ int register_netdevice(struct net_device *dev)
= hlist_entry(p, struct net_device, name_hlist);
if (!strncmp(d->name, dev->name, IFNAMSIZ)) {
ret = -EEXIST;
goto out;
goto err_uninit;
}
}
@ -3411,7 +3411,7 @@ int register_netdevice(struct net_device *dev)
ret = netdev_register_sysfs(dev);
if (ret)
goto out;
goto err_uninit;
dev->reg_state = NETREG_REGISTERED;
/*
@ -3436,6 +3436,11 @@ int register_netdevice(struct net_device *dev)
out:
return ret;
err_uninit:
if (dev->uninit)
dev->uninit(dev);
goto out;
}
/**