Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01cd267b authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Fixes: bfb15f2a ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 289e1f4e

include/linux/netfilter/nf_osf.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -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,

include/uapi/linux/netfilter/nf_osf.h

+2 −6
Original line number Original line Diff line number Diff line 
#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;