Skip to contentSkip to conversation

linux-next: build warning after merge of the netfilter-next tree

PATCH Applied Stephen Rothwell 4 participants 7 messages May 7, 2018 – May 17, 2018

Subsystems (2)
Linux-next tree netfilter
lore
Share & tools
lore

Stephen Rothwell

author
#0 lore raw

Hi all,

After merging the netfilter-next tree, today's linux-next build (x86_64 allmodconfig) produced this warning:

./usr/include/linux/netfilter/nf_osf.h:25: found __[us]{8,16,32,64} type without #include <linux/types.h>

Introduced by commit

bfb15f2a95cb ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")

Signature · 2 lines
Cheers,
Stephen Rothwell
author
#1 lore raw

Hi all,

Quoted 9 lines · On Mon, 7 May 2018 10:55:19 +1000 Stephen Rothwell <[email protected]> wrote:

After merging the netfilter-next tree, today's linux-next build (x86_64 allmodconfig) produced this warning:

./usr/include/linux/netfilter/nf_osf.h:25: found __[us]{8,16,32,64} type without #include <linux/types.h>

Introduced by commit

bfb15f2a95cb ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")

This warning now occurs after the merge of the net-next tree.

Signature · 2 lines
Cheers,
Stephen Rothwell
maintainer
#2 lore raw
Quoted 10 lines · Stephen Rothwell
Quoted 9 lines · On Mon, 7 May 2018 10:55:19 +1000 Stephen Rothwell <[email protected]> wrote:

After merging the netfilter-next tree, today's linux-next build (x86_64 allmodconfig) produced this warning:

./usr/include/linux/netfilter/nf_osf.h:25: found __[us]{8,16,32,64} type without #include <linux/types.h>

Introduced by commit

bfb15f2a95cb ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")

I'll send a fix for this, thanks for reporting.

#3 lore raw

Hi Florian,

Quoted 6 lines · Florian Westphal
Quoted 5 lines · Stephen Rothwell
Quoted 4 lines · On Mon, 7 May 2018 10:55:19 +1000 Stephen Rothwell <[email protected]> wrote:

After merging the netfilter-next tree, today's linux-next build (x86_64 allmodconfig) produced this warning:

Quoted 7 lines
Quoted 5 lines
Quoted 5 lines

./usr/include/linux/netfilter/nf_osf.h:25: found __[us]{8,16,32,64} type without #include <linux/types.h>

Introduced by commit

bfb15f2a95cb ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")

I'll send a fix for this, thanks for reporting.

+config NF_OSF
+ tristate 'Passive OS fingerprint infrastructure'

"There is no help available for this option."

Is this meant to be a user-visible symbol? I noticed it is selected by NETFILTER_XT_MATCH_OSF.

Thanks!

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
maintainer
#4 lore raw
Quoted 18 lines · Geert Uytterhoeven
Quoted 13 lines · Florian Westphal
Quoted 10 lines · Stephen Rothwell
Quoted 9 lines · On Mon, 7 May 2018 10:55:19 +1000 Stephen Rothwell <[email protected]> wrote:

After merging the netfilter-next tree, today's linux-next build (x86_64 allmodconfig) produced this warning:

./usr/include/linux/netfilter/nf_osf.h:25: found __[us]{8,16,32,64} type without #include <linux/types.h>

Introduced by commit

bfb15f2a95cb ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")

I'll send a fix for this, thanks for reporting.

(quoted diff) +2 -0
+config NF_OSF
+       tristate 'Passive OS fingerprint infrastructure'
Quoted 3 lines

"There is no help available for this option."

Is this meant to be a user-visible symbol?

No, its not. I can send a patch in case you're too busy, let me know.

maintainer
#5 lore raw

PATCH 1/1 netfilter: fix fallout from xt/nf osf separation

In reply to Stephen Rothwell

Stephen Rothwell says:
today's linux-next build (x86_64 allmodconfig) produced this warning:
./usr/include/linux/netfilter/nf_osf.h:25: found __[us]{8,16,32,64} type without #include <linux/types.h>

Fix that up and also move kernel-private struct out of uapi (it was not exposed in any released kernel version).

tested via allmodconfig build + make headers_check.

Reported-by Stephen Rothwell <[email protected]>
Fixes bfb15f2a95cb ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")
Signed-off-by Florian Westphal <[email protected]>
---
 include/linux/netfilter/nf_osf.h      | 6 ++++++
 include/uapi/linux/netfilter/nf_osf.h | 8 ++------
 2 files changed, 8 insertions(+), 6 deletions(-)
include/linux/netfilter/nf_osf.h +6 -0
index a2b39602e87d..0e114c492fb8 100644
@@ -21,6 +21,12 @@ enum osf_fmatch_states {
 	FMATCH_OPT_WRONG,
 };
 
+struct nf_osf_finger {
+	struct rcu_head			rcu_head;
+	struct list_head		finger_entry;
+	struct nf_osf_user_finger	finger;
+};
+
 bool nf_osf_match(const struct sk_buff *skb, u_int8_t family,
 		  int hooknum, struct net_device *in, struct net_device *out,
 		  const struct nf_osf_info *info, struct net *net,
include/uapi/linux/netfilter/nf_osf.h +2 -6
index 45376eae31ef..8f2f2f403183 100644
@@ -1,6 +1,8 @@
 #ifndef _NF_OSF_H
 #define _NF_OSF_H
 
+#include <linux/types.h>
+
 #define MAXGENRELEN	32
 
 #define NF_OSF_GENRE	(1 << 0)

@@ -57,12 +59,6 @@ struct nf_osf_user_finger {
 	struct nf_osf_opt	opt[MAX_IPOPTLEN];
 };
 
-struct nf_osf_finger {
-	struct rcu_head			rcu_head;
-	struct list_head		finger_entry;
-	struct nf_osf_user_finger	finger;
-};
-
 struct nf_osf_nlmsg {
 	struct nf_osf_user_finger	f;
 	struct iphdr			ip;
Signature · 1 line
2.16.1
maintainer Applied
#6 lore raw

Re: [PATCH nf-next] netfilter: fix fallout from xt/nf osf separation

Quoted 8 lines · Florian Westphal

Stephen Rothwell says:
today's linux-next build (x86_64 allmodconfig) produced this warning:
./usr/include/linux/netfilter/nf_osf.h:25: found __[us]{8,16,32,64} type without #include <linux/types.h>

Fix that up and also move kernel-private struct out of uapi (it was not exposed in any released kernel version).

tested via allmodconfig build + make headers_check.

Applied, thanks Florian.