From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
To: netdev@vger.kernel.org
Cc: yoshfuji@linux-ipv6.org, kuznet@ms2.inr.ac.ru,
davem@davemloft.net, herbert@gondor.apana.org.au,
steffen.klassert@secunet.com, eyal.birger@gmail.com
Subject: [PATCH 1/2] xfrm6: call kfree_skb when skb is toobig
Date: Thu, 30 Aug 2018 09:58:16 -0300 [thread overview]
Message-ID: <20180830125817.4567-1-cascardo@canonical.com> (raw)
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.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.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 reply other threads:[~2018-08-30 17:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-30 12:58 Thadeu Lima de Souza Cascardo [this message]
2018-08-30 12:58 ` [PATCH 2/2] vti6: do not check for ignore_df in order to update pmtu Thadeu Lima de Souza Cascardo
2018-08-31 6:42 ` Steffen Klassert
2018-08-30 13:23 ` [PATCH 1/2] xfrm6: call kfree_skb when skb is toobig Sabrina Dubroca
2018-08-31 6:47 ` Steffen Klassert
2018-08-31 11:38 ` [PATCH v2] " Thadeu Lima de Souza Cascardo
2018-09-03 8:21 ` Steffen Klassert
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=20180830125817.4567-1-cascardo@canonical.com \
--to=cascardo@canonical.com \
--cc=davem@davemloft.net \
--cc=eyal.birger@gmail.com \
--cc=herbert@gondor.apana.org.au \
--cc=kuznet@ms2.inr.ac.ru \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
--cc=yoshfuji@linux-ipv6.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;
as well as URLs for NNTP newsgroup(s).