| Message ID | 20191203141239.hztnqxtsa67ramsh@kili.mountain |
|---|---|
| State | Accepted |
| Delegated to: | David Ahern |
| Headers | show |
| Series | [v2] net: fix a leak in register_netdevice() | expand |
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Tue, 3 Dec 2019 17:12:39 +0300 > We have to free "dev->name_node" on this error path. > > Fixes: ff92741270bf ("net: introduce name_node struct to be used in hashlist") > Reported-by: syzbot+6e13e65ffbaa33757bcb@syzkaller.appspotmail.com > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > v2: dev->name_node can't be NULL so we can remove the check for that > in the cleanup code. Applied, thanks Dan.
diff --git a/net/core/dev.c b/net/core/dev.c index d75fd04d4e2c..c4ef4d7638ca 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -9246,7 +9246,7 @@ int register_netdevice(struct net_device *dev) if (ret) { if (ret > 0) ret = -EIO; - goto out; + goto err_free_name; } } @@ -9361,12 +9361,12 @@ int register_netdevice(struct net_device *dev) return ret; err_uninit: - if (dev->name_node) - netdev_name_node_free(dev->name_node); if (dev->netdev_ops->ndo_uninit) dev->netdev_ops->ndo_uninit(dev); if (dev->priv_destructor) dev->priv_destructor(dev); +err_free_name: + netdev_name_node_free(dev->name_node); goto out; } EXPORT_SYMBOL(register_netdevice);
We have to free "dev->name_node" on this error path. Fixes: ff92741270bf ("net: introduce name_node struct to be used in hashlist") Reported-by: syzbot+6e13e65ffbaa33757bcb@syzkaller.appspotmail.com Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- v2: dev->name_node can't be NULL so we can remove the check for that in the cleanup code. net/core/dev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)