From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>
Subject: [PATCH 2/6] xfrm6: call kfree_skb when skb is toobig
Date: Mon, 1 Oct 2018 10:58:51 +0200 [thread overview]
Message-ID: <20181001085855.12057-3-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20181001085855.12057-1-steffen.klassert@secunet.com>
From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
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>
---
net/ipv6/xfrm6_output.c | 2 ++
1 file changed, 2 insertions(+)
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;
}
--
2.17.1
next prev parent reply other threads:[~2018-10-01 15:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-01 8:58 pull request (net): ipsec 2018-10-01 Steffen Klassert
2018-10-01 8:58 ` [PATCH 1/6] xfrm: Validate address prefix lengths in the xfrm selector Steffen Klassert
2018-10-01 8:58 ` Steffen Klassert [this message]
2018-10-01 8:58 ` [PATCH 3/6] xfrm: reset transport header back to network header after all input transforms ahave been applied Steffen Klassert
2018-10-01 8:58 ` [PATCH 4/6] xfrm: reset crypto_done when iterating over multiple input xfrms Steffen Klassert
2018-10-01 8:58 ` [PATCH 5/6] xfrm: Fix NULL pointer dereference when skb_dst_force clears the dst_entry Steffen Klassert
2018-10-01 11:29 ` Sergei Shtylyov
2018-10-01 8:58 ` [PATCH 6/6] xfrm: validate template mode Steffen Klassert
2018-10-02 5:29 ` pull request (net): ipsec 2018-10-01 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181001085855.12057-3-steffen.klassert@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox