diff options
| author | Xin Long <lucien.xin@gmail.com> | 2019-09-13 17:45:47 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-16 09:08:18 +0200 |
| commit | 28e486037747c2180470b77c290d4090ad42f259 (patch) | |
| tree | f013c15d0c3921b8b89258f4a3175b007791c9aa /net/ipv6 | |
| parent | acdcecc61285faed359f1a3568c32089cc3a8329 (diff) | |
| download | linux-stable-28e486037747c2180470b77c290d4090ad42f259.tar.gz linux-stable-28e486037747c2180470b77c290d4090ad42f259.tar.bz2 linux-stable-28e486037747c2180470b77c290d4090ad42f259.zip | |
ip6_gre: fix a dst leak in ip6erspan_tunnel_xmit
In ip6erspan_tunnel_xmit(), if the skb will not be sent out, it has to
be freed on the tx_err path. Otherwise when deleting a netns, it would
cause dst/dev to leak, and dmesg shows:
unregister_netdevice: waiting for lo to become free. Usage count = 1
Fixes: ef7baf5e083c ("ip6_gre: add ip6 erspan collect_md mode")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index dd2d0b963260..d5779d6a6065 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -968,7 +968,7 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, if (unlikely(!tun_info || !(tun_info->mode & IP_TUNNEL_INFO_TX) || ip_tunnel_info_af(tun_info) != AF_INET6)) - return -EINVAL; + goto tx_err; key = &tun_info->key; memset(&fl6, 0, sizeof(fl6)); |