hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netfilter: fix fallout from xt/nf osf separation 

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 <sfr@canb.auug.org.au>
Fixes: bfb15f2a95 ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2018-05-08 10:05:38 +02:00 committed by Pablo Neira Ayuso
parent 289e1f4e9e
commit 01cd267bff
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/netfilter/nf_osf.h
View File

@ -21,6 +21,12 @@ enum osf_fmatch_states {
FMATCH_OPT_WRONG, 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, bool nf_osf_match(const struct sk_buff *skb, u_int8_t family,
int hooknum, struct net_device *in, struct net_device *out, int hooknum, struct net_device *in, struct net_device *out,
const struct nf_osf_info *info, struct net *net, const struct nf_osf_info *info, struct net *net,

8
include/uapi/linux/netfilter/nf_osf.h
View File

@ -1,6 +1,8 @@
#ifndef _NF_OSF_H #ifndef _NF_OSF_H
#define _NF_OSF_H #define _NF_OSF_H
#include <linux/types.h>
#define MAXGENRELEN 32 #define MAXGENRELEN 32
#define NF_OSF_GENRE (1 << 0) #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_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_nlmsg {
struct nf_osf_user_finger f; struct nf_osf_user_finger f;
struct iphdr ip; struct iphdr ip;