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

net: correct error path in rtnl_newlink()

Browse Source 
I saw the following BUG when ->newlink() fails in rtnl_newlink():

[   40.240058] kernel BUG at net/core/dev.c:6438!

this is due to free_netdev() is not supposed to be called before
netdev is completely unregistered, therefore it is not correct
to call free_netdev() here, at least for ops->newlink!=NULL case,
many drivers call it in ->destructor so that rtnl_unlock() will
take care of it, we probably don't need to do anything here.

Cc: David S. Miller <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Cong Wang 2014-02-11 15:51:30 -08:00 committed by David S. Miller
parent da37705cef
commit 0e0eee2465
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/core/rtnetlink.c
View File

@ -1963,16 +1963,21 @@ replay:
dev->ifindex = ifm->ifi_index; dev->ifindex = ifm->ifi_index;
if (ops->newlink) if (ops->newlink) {
err = ops->newlink(net, dev, tb, data); err = ops->newlink(net, dev, tb, data);
else /* Drivers should call free_netdev() in ->destructor
* and unregister it on failure so that device could be
* finally freed in rtnl_unlock.
*/
if (err < 0)
goto out;
} else {
err = register_netdevice(dev); err = register_netdevice(dev);
if (err < 0) {
if (err < 0) { free_netdev(dev);
free_netdev(dev); goto out;
goto out; }
} }
err = rtnl_configure_link(dev, ifm); err = rtnl_configure_link(dev, ifm);
if (err < 0) if (err < 0)
unregister_netdevice(dev); unregister_netdevice(dev);