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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190412163720.576c6610@canb.auug.org.au>
Date:   Fri, 12 Apr 2019 16:37:20 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Pablo Neira Ayuso <pablo@...filter.org>,
        NetFilter <netfilter-devel@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Florian Westphal <fw@...len.de>,
        "David S. Miller" <davem@...emloft.net>,
        Nikolay Aleksandrov <nikolay@...ulusnetworks.com>
Subject: linux-next: build failure after merge of the netfilter-next tree

Hi all,

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

In file included from /home/sfr/next/next/net/bridge/br_input.c:19:
/home/sfr/next/next/include/net/netfilter/nf_queue.h:16:23: error: field 'state'
 has incomplete type
  struct nf_hook_state state;
                       ^~~~~

Caused by commit

  971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path")

This build has CONFIG_NETFILTER not set.

I have applied this patch for today:

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Fri, 12 Apr 2019 16:32:47 +1000
Subject: [PATCH] bridge: only include nf_queue.h if needed

---
 net/bridge/br_input.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index e0aacfedcfe1..86dc46f6a68f 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -16,7 +16,9 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/netfilter_bridge.h>
+#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
 #include <net/netfilter/nf_queue.h>
+#endif
 #include <linux/neighbour.h>
 #include <net/arp.h>
 #include <linux/export.h>
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped