diff options
| author | Thadeu Lima de Souza Cascardo <cascardo@canonical.com> | 2018-08-31 08:38:49 -0300 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2018-09-03 07:37:57 +0200 |
| commit | 215ab0f021c9fea3c18b75e7d522400ee6a49990 (patch) | |
| tree | 207c34d777bb1e7d24f658929e96b7a51d0cfed7 /net/ipv6/xfrm6_output.c | |
| parent | 07bf7908950a8b14e81aa1807e3c667eab39287a (diff) | |
| download | lwn-215ab0f021c9fea3c18b75e7d522400ee6a49990.tar.gz lwn-215ab0f021c9fea3c18b75e7d522400ee6a49990.zip | |
xfrm6: call kfree_skb when skb is toobig
After commit d6990976af7c5d8f55903bfb4289b6fb030bf754 ("vti6: fix PMTU caching
and reporting on xmit"), some too big skbs might be potentially passed down to
__xfrm6_output, causing it to fail to transmit but not free the skb, causing a
leak of skb, and consequentially a leak of dst references.
After running pmtu.sh, that shows as failure to unregister devices in a namespace:
[ 311.397671] unregister_netdevice: waiting for veth_b to become free. Usage count = 1
The fix is to call kfree_skb in case of transmit failures.
Fixes: dd767856a36e ("xfrm6: Don't call icmpv6_send on local error")
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv6/xfrm6_output.c')
| -rw-r--r-- | net/ipv6/xfrm6_output.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c index 5959ce9620eb..6a74080005cf 100644 --- a/net/ipv6/xfrm6_output.c +++ b/net/ipv6/xfrm6_output.c @@ -170,9 +170,11 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb) if (toobig && xfrm6_local_dontfrag(skb)) { xfrm6_local_rxpmtu(skb, mtu); + kfree_skb(skb); return -EMSGSIZE; } else if (!skb->ignore_df && toobig && skb->sk) { xfrm_local_error(skb, mtu); + kfree_skb(skb); return -EMSGSIZE; } |