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

Commit 78458e3e authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Pablo Neira Ayuso
Browse files

netfilter: add missing IS_ENABLED(CONFIG_NETFILTER) checks to some header-files. 



linux/netfilter.h defines a number of struct and inline function
definitions which are only available is CONFIG_NETFILTER is enabled.
These structs and functions are used in declarations and definitions in
other header-files.  Added preprocessor checks to make sure these
headers will compile if CONFIG_NETFILTER is disabled.

Signed-off-by: default avatarJeremy Sowden <jeremy@azazel.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 0abc8bf4

include/linux/netfilter/x_tables.h

+6 −0
Original line number Diff line number Diff line
@@ -35,12 +35,15 @@ struct xt_action_param { 
	union {

		const void *matchinfo, *targinfo;

	};

#if IS_ENABLED(CONFIG_NETFILTER)

	const struct nf_hook_state *state;

#endif

	int fragoff;

	unsigned int thoff;

	bool hotdrop;

};



#if IS_ENABLED(CONFIG_NETFILTER)

static inline struct net *xt_net(const struct xt_action_param *par)

{

	return par->state->net;
@@ -75,6 +78,7 @@ static inline u_int8_t xt_family(const struct xt_action_param *par) 
{

	return par->state->pf;

}

#endif



/**

 * struct xt_mtchk_param - parameters for match extensions'
@@ -446,7 +450,9 @@ xt_get_per_cpu_counter(struct xt_counters *cnt, unsigned int cpu) 
	return cnt;

}



#if IS_ENABLED(CONFIG_NETFILTER)

struct nf_hook_ops *xt_hook_ops_alloc(const struct xt_table *, nf_hookfn *);

#endif



#ifdef CONFIG_COMPAT

#include <net/compat.h>

include/linux/netfilter_arp/arp_tables.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct arpt_error { 
}



extern void *arpt_alloc_initial_table(const struct xt_table *);

#if IS_ENABLED(CONFIG_NETFILTER)

int arpt_register_table(struct net *net, const struct xt_table *table,

			const struct arpt_replace *repl,

			const struct nf_hook_ops *ops, struct xt_table **res);
@@ -57,6 +58,7 @@ void arpt_unregister_table(struct net *net, struct xt_table *table, 
extern unsigned int arpt_do_table(struct sk_buff *skb,

				  const struct nf_hook_state *state,

				  struct xt_table *table);

#endif



#ifdef CONFIG_COMPAT

#include <net/compat.h>

include/linux/netfilter_bridge/ebtables.h

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ struct ebt_table { 


#define EBT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1)) & \

		     ~(__alignof__(struct _xt_align)-1))

#if IS_ENABLED(CONFIG_NETFILTER)

extern int ebt_register_table(struct net *net,

			      const struct ebt_table *table,

			      const struct nf_hook_ops *ops,
@@ -114,6 +115,7 @@ extern void ebt_unregister_table(struct net *net, struct ebt_table *table, 
extern unsigned int ebt_do_table(struct sk_buff *skb,

				 const struct nf_hook_state *state,

				 struct ebt_table *table);

#endif



/* True if the hook mask denotes that the rule is in a base chain,

 * used in the check() functions */

include/linux/netfilter_ipv4/ip_tables.h

+4 −0
Original line number Diff line number Diff line
@@ -25,11 +25,13 @@ 


extern void ipt_init(void) __init;



#if IS_ENABLED(CONFIG_NETFILTER)

int ipt_register_table(struct net *net, const struct xt_table *table,

		       const struct ipt_replace *repl,

		       const struct nf_hook_ops *ops, struct xt_table **res);

void ipt_unregister_table(struct net *net, struct xt_table *table,

			  const struct nf_hook_ops *ops);

#endif



/* Standard entry. */

struct ipt_standard {
@@ -65,9 +67,11 @@ struct ipt_error { 
}



extern void *ipt_alloc_initial_table(const struct xt_table *);

#if IS_ENABLED(CONFIG_NETFILTER)

extern unsigned int ipt_do_table(struct sk_buff *skb,

				 const struct nf_hook_state *state,

				 struct xt_table *table);

#endif



#ifdef CONFIG_COMPAT

#include <net/compat.h>

include/linux/netfilter_ipv6/ip6_tables.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
extern void ip6t_init(void) __init;



extern void *ip6t_alloc_initial_table(const struct xt_table *);

#if IS_ENABLED(CONFIG_NETFILTER)

int ip6t_register_table(struct net *net, const struct xt_table *table,

			const struct ip6t_replace *repl,

			const struct nf_hook_ops *ops, struct xt_table **res);
@@ -34,6 +35,7 @@ void ip6t_unregister_table(struct net *net, struct xt_table *table, 
extern unsigned int ip6t_do_table(struct sk_buff *skb,

				  const struct nf_hook_state *state,

				  struct xt_table *table);

#endif



/* Check for an extension */

static inline int