From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>,
Steffen Klassert <steffen.klassert@secunet.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 3.18 02/15] xfrm6: call kfree_skb when skb is toobig
Date: Tue, 16 Oct 2018 00:16:37 -0400 [thread overview]
Message-ID: <20181016041650.135958-2-sashal@kernel.org> (raw)
In-Reply-To: <20181016041650.135958-1-sashal@kernel.org>
From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
[ Upstream commit 215ab0f021c9fea3c18b75e7d522400ee6a49990 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 ca3f29b98ae5..63724226042c 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -151,9 +151,11 @@ static int __xfrm6_output(struct sk_buff *skb)
if (skb->len > mtu && xfrm6_local_dontfrag(skb)) {
xfrm6_local_rxpmtu(skb, mtu);
+ kfree_skb(skb);
return -EMSGSIZE;
} else if (!skb->ignore_df && skb->len > mtu && skb->sk) {
xfrm_local_error(skb, mtu);
+ kfree_skb(skb);
return -EMSGSIZE;
}
--
2.17.1
next prev parent reply other threads:[~2018-10-16 4:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-16 4:16 [PATCH AUTOSEL 3.18 01/15] xfrm: Validate address prefix lengths in the xfrm selector Sasha Levin
2018-10-16 4:16 ` Sasha Levin [this message]
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 03/15] cfg80211: reg: Init wiphy_idx in regulatory_hint_core() Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 04/15] ARM: 8799/1: mm: fix pci_ioremap_io() offset check Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 05/15] xfrm: validate template mode Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 06/15] asix: Check for supported Wake-on-LAN modes Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 07/15] ax88179_178a: " Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 08/15] sr9800: " Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 09/15] smsc75xx: Check for " Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 10/15] smsc95xx: " Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 11/15] qlcnic: fix Tx descriptor corruption on 82xx devices Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 12/15] i2c: i2c-scmi: fix for i2c_smbus_write_block_data Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 13/15] perf/ring_buffer: Prevent concurent ring buffer access Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 14/15] net/usb: cancel pending work when unbinding smsc75xx Sasha Levin
2018-10-16 4:16 ` [PATCH AUTOSEL 3.18 15/15] net: cxgb3_main: fix a missing-check bug Sasha Levin
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=20181016041650.135958-2-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=cascardo@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/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
Powered by JetHome