From: "Maciej Żenczykowski" <zenczykowski@gmail•com>
To: "Maciej Żenczykowski" <maze@google•com>,
"David S . Miller" <davem@davemloft•net>
Cc: netdev@vger•kernel.org, Cong Wang <xiyou.wangcong@gmail•com>,
Eric Dumazet <edumazet@google•com>,
Pablo Neira Ayuso <pablo@netfilter•org>
Subject: [PATCH 2/2] netfilter: revert "conntrack: silent a memory leak warning"
Date: Mon, 7 Oct 2019 22:35:07 -0700 [thread overview]
Message-ID: <20191008053507.252202-2-zenczykowski@gmail.com> (raw)
In-Reply-To: <20191008053507.252202-1-zenczykowski@gmail.com>
From: Maciej Żenczykowski <maze@google•com>
This reverts commit 114aa35d06d4920c537b72f9fa935de5dd205260.
By my understanding of kmemleak the reasoning for this patch
is incorrect. If kmemleak couldn't handle rcu we'd have it
reporting leaks all over the place. My belief is that this
was instead papering over a real leak.
Cc: Cong Wang <xiyou.wangcong@gmail•com>
Cc: Eric Dumazet <edumazet@google•com>
Cc: Pablo Neira Ayuso <pablo@netfilter•org>
Signed-off-by: Maciej Żenczykowski <maze@google•com>
---
net/netfilter/nf_conntrack_extend.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c
index d4ed1e197921..fb208877338a 100644
--- a/net/netfilter/nf_conntrack_extend.c
+++ b/net/netfilter/nf_conntrack_extend.c
@@ -68,7 +68,6 @@ void *nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)
rcu_read_unlock();
alloc = max(newlen, NF_CT_EXT_PREALLOC);
- kmemleak_not_leak(old);
new = __krealloc(old, alloc, gfp);
if (!new)
return NULL;
--
2.23.0.581.g78d2f28ef7-goog
next prev parent reply other threads:[~2019-10-08 5:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-08 5:35 [PATCH 1/2] netfilter: fix a memory leak in nf_conntrack_in Maciej Żenczykowski
2019-10-08 5:35 ` Maciej Żenczykowski [this message]
2019-10-08 5:38 ` [PATCH 2/2] netfilter: revert "conntrack: silent a memory leak warning" Maciej Żenczykowski
2019-10-08 5:58 ` Cong Wang
2019-10-08 6:04 ` Florian Westphal
2019-10-08 6:45 ` Maciej Żenczykowski
2019-10-08 7:10 ` Maciej Żenczykowski
2019-10-10 18:36 ` Cong Wang
2019-10-17 18:30 ` Maciej Żenczykowski
2019-10-08 6:01 ` [PATCH 1/2] netfilter: fix a memory leak in nf_conntrack_in Florian Westphal
2019-10-08 6:05 ` Cong Wang
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=20191008053507.252202-2-zenczykowski@gmail.com \
--to=zenczykowski@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=maze@google$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pablo@netfilter$(echo .)org \
--cc=xiyou.wangcong@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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