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")
--
Cheers,
Stephen Rothwell
Hi all,
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.
--
Cheers,
Stephen Rothwell
Stephen Rothwell <[email protected]> wrote:
> 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.
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(-)
diff --git a/include/linux/netfilter/nf_osf.h b/include/linux/netfilter/nf_osf.h
index a2b39602e87d..0e114c492fb8 100644
--- a/include/linux/netfilter/nf_osf.h
+++ b/include/linux/netfilter/nf_osf.h
@@ -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,
diff --git a/include/uapi/linux/netfilter/nf_osf.h b/include/uapi/linux/netfilter/nf_osf.h
index 45376eae31ef..8f2f2f403183 100644
--- a/include/uapi/linux/netfilter/nf_osf.h
+++ b/include/uapi/linux/netfilter/nf_osf.h
@@ -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;
--
2.16.1
Hi Florian,
On Tue, May 8, 2018 at 9:17 AM, Florian Westphal <[email protected]> wrote:
> Stephen Rothwell <[email protected]> wrote:
>> 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.
+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
--
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
Geert Uytterhoeven <[email protected]> wrote:
> On Tue, May 8, 2018 at 9:17 AM, Florian Westphal <[email protected]> wrote:
> > Stephen Rothwell <[email protected]> wrote:
> >> 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.
>
> +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?
No, its not. I can send a patch in case you're too busy, let me know.
On Tue, May 08, 2018 at 10:05:38AM +0200, Florian Westphal wrote:
> 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.