2018-04-16 23:31:40

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: build failure after merge of the netfilter tree

---

Hi all,

After merging the netfilter tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

net/netfilter/nf_conntrack_extend.c: In function 'nf_ct_ext_
add':
net/netfilter/nf_conntrack_extend.c:74:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
kmemleak_not_leak(old);
^~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors

Caused by commit

114aa35d06d4 ("netfilter: conntrack: silent a memory leak warning")

I have added this patch for today:

From: Stephen Rothwell <[email protected]>
Date: Tue, 17 Apr 2018 09:26:49 +1000
Subject: [PATCH] netfilter: conntrack: include kmemleak.h for
kmemleak_not_leak()

Signed-off-by: Stephen Rothwell <[email protected]>
---
net/netfilter/nf_conntrack_extend.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c
index bd71a828ebde..277bbfe26478 100644
--- a/net/netfilter/nf_conntrack_extend.c
+++ b/net/netfilter/nf_conntrack_extend.c
@@ -9,6 +9,7 @@
* 2 of the License, or (at your option) any later version.
*/
#include <linux/kernel.h>
+#include <linux/kmemleak.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/rcupdate.h>
--
2.16.3

--
Cheers,
Stephen Rothwell

---

Attachments:

(No filename) (499.00 B)
OpenPGP digital signature

2018-04-17 00:53:04

by Cong Wang

[permalink] [raw]

Subject: Re: linux-next: build failure after merge of the netfilter tree

---

On Mon, Apr 16, 2018 at 4:28 PM, Stephen Rothwell <[email protected]> wrote:
> Hi all,
>
> After merging the netfilter tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> net/netfilter/nf_conntrack_extend.c: In function 'nf_ct_ext_
> add':
> net/netfilter/nf_conntrack_extend.c:74:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
> kmemleak_not_leak(old);
> ^~~~~~~~~~~~~~~~~
> cc1: some warnings being treated as errors
>
> Caused by commit
>
> 114aa35d06d4 ("netfilter: conntrack: silent a memory leak warning")
>
> I have added this patch for today:

Ouch, this is actually a correct fix.

Can you please send it formally or maybe Pablo can just take it directly?

Thanks!

2018-04-17 09:03:14

by Pablo Neira Ayuso

[permalink] [raw]

Subject: Re: linux-next: build failure after merge of the netfilter tree

---

On Mon, Apr 16, 2018 at 05:51:12PM -0700, Cong Wang wrote:
> On Mon, Apr 16, 2018 at 4:28 PM, Stephen Rothwell <[email protected]> wrote:
> > Hi all,
> >
> > After merging the netfilter tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > net/netfilter/nf_conntrack_extend.c: In function 'nf_ct_ext_
> > add':
> > net/netfilter/nf_conntrack_extend.c:74:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
> > kmemleak_not_leak(old);
> > ^~~~~~~~~~~~~~~~~
> > cc1: some warnings being treated as errors
> >
> > Caused by commit
> >
> > 114aa35d06d4 ("netfilter: conntrack: silent a memory leak warning")
> >
> > I have added this patch for today:
>
> Ouch, this is actually a correct fix.
>
> Can you please send it formally or maybe Pablo can just take it directly?

I have applied Stephen's patch, thanks!