diff options
| author | Gao Feng <gfree.wind@vip.163.com> | 2017-12-26 21:44:32 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-03 10:24:33 +0100 |
| commit | f22fec25935dee1dd769c84f100b173e1565c335 (patch) | |
| tree | 0e0dfdb5cca9b369e63e6e87a9ba2c63c3fe5f8b | |
| parent | 4d3d428c56a04893782a8d0b1e2b4ad8b34a5f45 (diff) | |
| download | linux-stable-f22fec25935dee1dd769c84f100b173e1565c335.tar.gz linux-stable-f22fec25935dee1dd769c84f100b173e1565c335.tar.bz2 linux-stable-f22fec25935dee1dd769c84f100b173e1565c335.zip | |
macvlan: Fix one possible double free
[ Upstream commit d02fd6e7d2933ede6478a15f9e4ce8a93845824e ]
Because the macvlan_uninit would free the macvlan port, so there is one
double free case in macvlan_common_newlink. When the macvlan port is just
created, then register_netdevice or netdev_upper_dev_link failed and they
would invoke macvlan_uninit. Then it would reach the macvlan_port_destroy
which triggers the double free.
Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/macvlan.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index fb1c9e095d0c..176fc0906bfe 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -1441,9 +1441,14 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, return 0; unregister_netdev: + /* macvlan_uninit would free the macvlan port */ unregister_netdevice(dev); + return err; destroy_macvlan_port: - if (create) + /* the macvlan port may be freed by macvlan_uninit when fail to register. + * so we destroy the macvlan port only when it's valid. + */ + if (create && macvlan_port_get_rtnl(dev)) macvlan_port_destroy(port->dev); return err; } |