Re: PROBLEM: Memory leak (at least with SLUB) from "secpath_dup" (xfrm) in 3.5+ kernels
flat view
From: Eric Dumazet <hidden>
Date: 2012-10-22 15:16:43
Also in:
linux-mm
Subsystem:
networking [general], networking [ipv4/ipv6], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds
On Mon, 2012-10-22 at 18:06 +0600, Mike Kazantsev wrote:
On Mon, 22 Oct 2012 10:15:43 +0200 Eric Dumazet [off-list ref] wrote:quoted
On Mon, 2012-10-22 at 04:58 +0600, Mike Kazantsev wrote:quoted
I've grepped for "/org/free" specifically and sure enough, same scraps of data seem to be in some of the (varied) dumps there.Content is not meaningful, as we dont initialize it. So you see previous content. Could you try the following :... With this patch on top of v3.7-rc2 (w/o patches from your previous mail), leak seem to be still present.
OK, I believe I found the bug in IPv4 defrag / IPv6 reasm Please test the following patch. Thanks !
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 448e685..0a52771 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c@@ -48,6 +48,7 @@ #include <linux/inet.h> #include <linux/netfilter_ipv4.h> #include <net/inet_ecn.h> +#include <net/xfrm.h> /* NOTE. Logic of IP defragmentation is parallel to corresponding IPv6 * code now. If you change something here, _PLEASE_ update ipv6/reassembly.c
@@ -634,6 +635,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, else if (head->ip_summed == CHECKSUM_COMPLETE) head->csum = csum_add(head->csum, fp->csum); + secpath_reset(fp); if (skb_try_coalesce(head, fp, &headstolen, &delta)) { kfree_skb_partial(fp, headstolen); } else {
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index da8a4e3..4fcc463 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c@@ -55,6 +55,7 @@ #include <net/ndisc.h> #include <net/addrconf.h> #include <net/inet_frag.h> +#include <net/xfrm.h> struct ip6frag_skb_cb {
@@ -456,6 +457,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev, else if (head->ip_summed == CHECKSUM_COMPLETE) head->csum = csum_add(head->csum, fp->csum); + secpath_reset(fp); if (skb_try_coalesce(head, fp, &headstolen, &delta)) { kfree_skb_partial(fp, headstolen); } else {