netfilter: add missing IS_ENABLED(CONFIG_NF_TABLES) check to header-file.
Subsystems (4)
Pablo Neira Ayuso
maintainerPATCH 10/17 netfilter: add missing IS_ENABLED(CONFIG_NF_TABLES) check to header-file.
From: Jeremy Sowden <[email protected]>
nf_tables.h defines an API comprising several inline functions and macros that depend on the nft member of struct net. However, this is only defined is CONFIG_NF_TABLES is enabled. Added preprocessor checks to ensure that nf_tables.h will compile if CONFIG_NF_TABLES is disabled.
--- include/net/netfilter/nf_tables.h | 4 ++++ 1 file changed, 4 insertions(+)
include/net/netfilter/nf_tables.h +4 -0
@@ -1207,6 +1207,8 @@ void nft_trace_notify(struct nft_traceinfo *info);#define MODULE_ALIAS_NFT_OBJ (type) \ MODULE_ALIAS("nft-obj-" __stringify(type)) +#if IS_ENABLED (CONFIG_NF_TABLES ) +/* * The gencursor defines two generations, the currently active and the * next one. Objects contain a bitmask of 2 bits specifying the generations
@@ -1280,6 +1282,8 @@ static inline void nft_set_elem_change_active(const struct net *net, ext->genmask ^= nft_genmask_next(net); } +#endif /* IS_ENABLED(CONFIG_NF_TABLES) */ +/* * We use a free bit in the genmask field to indicate the element * is busy, meaning it is currently being processed either by
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 11/17 netfilter: add missing IS_ENABLED(CONFIG_NF_CONNTRACK) checks to some header-files.
From: Jeremy Sowden <[email protected]>
struct nf_conn contains a "struct nf_conntrack ct_general" member and struct net contains a "struct netns_ct ct" member which are both only defined in CONFIG_NF_CONNTRACK is enabled. These members are used in a number of inline functions defined in other header-files. Added preprocessor checks to make sure the headers will compile if CONFIG_NF_CONNTRACK is disabled.
--- include/net/netfilter/nf_conntrack.h | 10 ++++++++++ include/net/netfilter/nf_conntrack_acct.h | 13 +++++++++++++ include/net/netfilter/nf_conntrack_l4proto.h | 2 ++ include/net/netfilter/nf_conntrack_timestamp.h | 6 ++++++ 4 files changed, 31 insertions(+)
include/net/netfilter/nf_conntrack.h +10 -0
@@ -59,6 +59,7 @@ struct nf_conntrack_net {#include <net/netfilter/ipv6/nf_conntrack_ipv6.h> struct nf_conn { +#if IS_ENABLED (CONFIG_NF_CONNTRACK )/* Usage count in here is 1 for hash table, 1 per skb, * plus 1 for any connection(s) we are `master' for *
@@ -68,6 +69,7 @@ struct nf_conn {* beware nf_ct_get() is different and don't inc refcnt. */ struct nf_conntrack ct_general; +#endif spinlock_t lock;/* jiffies32 when this ct is considered dead */
@@ -148,6 +150,8 @@ void nf_conntrack_alter_reply(struct nf_conn *ct,int nf_conntrack_tuple_taken (const struct nf_conntrack_tuple *tuple,const struct nf_conn *ignored_conntrack); +#if IS_ENABLED (CONFIG_NF_CONNTRACK ) +#define NFCT_INFOMASK 7UL#define NFCT_PTRMASK ~(NFCT_INFOMASK)
@@ -167,6 +171,8 @@ static inline void nf_ct_put(struct nf_conn *ct) nf_conntrack_put(&ct->ct_general); } +#endif +/* Protocol module loading */ int nf_ct_l3proto_try_module_get (unsigned short l3proto);void nf_ct_l3proto_module_put (unsigned short l3proto);
@@ -318,12 +324,16 @@ void nf_ct_tmpl_free(struct nf_conn *tmpl);u32 nf_ct_get_id (const struct nf_conn *ct); +#if IS_ENABLED (CONFIG_NF_CONNTRACK ) +static inline void nf_ct_set (struct sk_buff *skb,struct nf_conn *ct,enum ip_conntrack_info info) { skb->_nfct = (unsigned long )ct | info; } +#endif +#define NF_CT_STAT_INC (net, count) __this_cpu_inc((net)->ct.stat->count)#define NF_CT_STAT_INC_ATOMIC (net, count) this_cpu_inc((net)->ct.stat->count)#define NF_CT_STAT_ADD_ATOMIC (net, count, v) this_cpu_add((net)->ct.stat->count, (v))
include/net/netfilter/nf_conntrack_acct.h +13 -0
@@ -29,6 +29,7 @@ struct nf_conn_acct *nf_conn_acct_find(const struct nf_conn *ct)static inline struct nf_conn_acct *nf_ct_acct_ext_add (struct nf_conn *ct,gfp_t gfp) { +#if IS_ENABLED (CONFIG_NF_CONNTRACK )struct net *net =nf_ct_net (ct);struct nf_conn_acct *acct;
@@ -41,22 +42,34 @@ struct nf_conn_acct *nf_ct_acct_ext_add(struct nf_conn *ct, gfp_t gfp)return acct; +#else +return NULL ; +#endif };/* Check if connection tracking accounting is enabled */ static inline bool nf_ct_acct_enabled (struct net *net) { +#if IS_ENABLED (CONFIG_NF_CONNTRACK )return net->ct.sysctl_acct !=0 ; +#else +return false; +#endif }/* Enable/disable connection tracking accounting */ static inline void nf_ct_set_acct (struct net *net,bool enable) { +#if IS_ENABLED (CONFIG_NF_CONNTRACK ) net->ct.sysctl_acct = enable; +#endif } +#if IS_ENABLED (CONFIG_NF_CONNTRACK )void nf_conntrack_acct_pernet_init (struct net *net);int nf_conntrack_acct_init (void );void nf_conntrack_acct_fini (void ); +#endif /* IS_ENABLED(CONFIG_NF_CONNTRACK) */ +#endif /* _NF_CONNTRACK_ACCT_H */
include/net/netfilter/nf_conntrack_l4proto.h +2 -0
@@ -176,6 +176,7 @@ void nf_ct_l4proto_log_invalid(const struct sk_buff *skb, const char *fmt, ...) { }#endif /* CONFIG_SYSCTL */ +#if IS_ENABLED (CONFIG_NF_CONNTRACK )static inline struct nf_generic_net *nf_generic_pernet (struct net *net) {return &net->ct.nf_ct_proto.generic;
@@ -200,6 +201,7 @@ static inline struct nf_icmp_net *nf_icmpv6_pernet(struct net *net) {return &net->ct.nf_ct_proto.icmpv6; } +#endif #ifdef CONFIG_NF_CT_PROTO_DCCP static inline struct nf_dccp_net *nf_dccp_pernet (struct net *net)
include/net/netfilter/nf_conntrack_timestamp.h +6 -0
@@ -40,12 +40,18 @@ struct nf_conn_tstamp *nf_ct_tstamp_ext_add(struct nf_conn *ct, gfp_t gfp)static inline bool nf_ct_tstamp_enabled (struct net *net) { +#if IS_ENABLED (CONFIG_NF_CONNTRACK )return net->ct.sysctl_tstamp !=0 ; +#else +return false; +#endif }static inline void nf_ct_set_tstamp (struct net *net,bool enable) { +#if IS_ENABLED (CONFIG_NF_CONNTRACK ) net->ct.sysctl_tstamp = enable; +#endif }#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 12/17 netfilter: add missing IS_ENABLED(CONFIG_NETFILTER) checks to some header-files.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
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.
--- include/linux/netfilter/x_tables.h | 6 ++++++ include/linux/netfilter_arp/arp_tables.h | 2 ++ include/linux/netfilter_bridge/ebtables.h | 2 ++ include/linux/netfilter_ipv4/ip_tables.h | 4 ++++ include/linux/netfilter_ipv6/ip6_tables.h | 2 ++ include/net/netfilter/br_netfilter.h | 2 ++ include/net/netfilter/nf_conntrack_bridge.h | 2 ++ include/net/netfilter/nf_conntrack_core.h | 3 +++ include/net/netfilter/nf_conntrack_l4proto.h | 2 ++ include/net/netfilter/nf_conntrack_tuple.h | 2 ++ include/net/netfilter/nf_flow_table.h | 4 ++++ include/net/netfilter/nf_nat.h | 4 ++++ include/net/netfilter/nf_queue.h | 5 +++++ include/net/netfilter/nf_synproxy.h | 4 ++++ include/net/netfilter/nf_tables.h | 8 ++++++++ 15 files changed, 52 insertions(+)
include/linux/netfilter/x_tables.h +6 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
include/net/netfilter/br_netfilter.h +2 -0
@@ -55,6 +55,7 @@ static inline struct rtable *bridge_parent_rtable(const struct net_device *dev)struct net_device *setup_pre_routing (struct sk_buff *skb,const struct net *net); +#if IS_ENABLED (CONFIG_NETFILTER )#if IS_ENABLED (CONFIG_IPV6 )int br_validate_ipv6 (struct net *net,struct sk_buff *skb); unsigned int br_nf_pre_routing_ipv6(void *priv,
@@ -73,5 +74,6 @@ br_nf_pre_routing_ipv6(const struct nf_hook_ops *ops, struct sk_buff *skb,return NF_ACCEPT ; }#endif +#endif #endif /* _BR_NETFILTER_H_ */
include/net/netfilter/nf_conntrack_bridge.h +2 -0
@@ -6,7 +6,9 @@#include <uapi/linux/if_ether.h> struct nf_ct_bridge_info { +#if IS_ENABLED (CONFIG_NETFILTER )struct nf_hook_ops *ops; +#endif unsigned int ops_size;struct module *me; };
include/net/netfilter/nf_conntrack_core.h +3 -0
@@ -20,7 +20,10 @@/* This header is used to share core functionality between the standalone connection tracking module, and the compatibility layer's use of connection tracking. */ + +#if IS_ENABLED (CONFIG_NETFILTER )unsigned int nf_conntrack_in (struct sk_buff *skb,const struct nf_hook_state *state); +#endif int nf_conntrack_init_net (struct net *net);void nf_conntrack_cleanup_net (struct net *net);
include/net/netfilter/nf_conntrack_l4proto.h +2 -0
@@ -75,6 +75,7 @@ bool nf_conntrack_invert_icmp_tuple(struct nf_conntrack_tuple *tuple,bool nf_conntrack_invert_icmpv6_tuple (struct nf_conntrack_tuple *tuple,const struct nf_conntrack_tuple *orig); +#if IS_ENABLED (CONFIG_NETFILTER ) int nf_conntrack_inet_error(struct nf_conn *tmpl, struct sk_buff *skb, unsigned int dataoff, const struct nf_hook_state *state,
@@ -131,6 +132,7 @@ int nf_conntrack_gre_packet(struct nf_conn *ct,unsigned int dataoff, enum ip_conntrack_info ctinfo, const struct nf_hook_state *state); +#endif void nf_conntrack_generic_init_net (struct net *net);void nf_conntrack_tcp_init_net (struct net *net);
include/net/netfilter/nf_conntrack_tuple.h +2 -0
@@ -121,6 +121,7 @@ struct nf_conntrack_tuple_hash {struct nf_conntrack_tuple tuple; }; +#if IS_ENABLED (CONFIG_NETFILTER )static inline bool __nf_ct_tuple_src_equal (const struct nf_conntrack_tuple *t1,const struct nf_conntrack_tuple *t2) {
@@ -183,5 +184,6 @@ nf_ct_tuple_mask_cmp(const struct nf_conntrack_tuple *t,return nf_ct_tuple_src_mask_cmp (t, tuple, mask) &&__nf_ct_tuple_dst_equal (t, tuple); } +#endif #endif /* _NF_CONNTRACK_TUPLE_H */
include/net/netfilter/nf_flow_table.h +4 -0
@@ -17,7 +17,9 @@ struct nf_flowtable_type {int family;int (*init)(struct nf_flowtable *ft);void (*free)(struct nf_flowtable *ft); +#if IS_ENABLED (CONFIG_NETFILTER )nf_hookfn *hook; +#endif struct module *owner; };
@@ -115,10 +117,12 @@ struct flow_ports {__be16 source, dest; }; +#if IS_ENABLED (CONFIG_NETFILTER )unsigned int nf_flow_offload_ip_hook (void *priv,struct sk_buff *skb,const struct nf_hook_state *state);unsigned int nf_flow_offload_ipv6_hook (void *priv,struct sk_buff *skb,const struct nf_hook_state *state); +#endif #define MODULE_ALIAS_NF_FLOWTABLE (family) \ MODULE_ALIAS("nf-flowtable-" __stringify(family))
include/net/netfilter/nf_nat.h +4 -0
@@ -69,10 +69,12 @@ static inline bool nf_nat_oif_changed(unsigned int hooknum,#endif } +#if IS_ENABLED (CONFIG_NETFILTER )int nf_nat_register_fn (struct net *net,u8 pf,const struct nf_hook_ops *ops,const struct nf_hook_ops *nat_ops,unsigned int ops_count);void nf_nat_unregister_fn (struct net *net,u8 pf,const struct nf_hook_ops *ops,unsigned int ops_count); +#endif unsigned int nf_nat_packet (struct nf_conn *ct,enum ip_conntrack_info ctinfo,unsigned int hooknum,struct sk_buff *skb);
@@ -92,6 +94,7 @@ int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, struct nf_conn *ct,enum ip_conntrack_info ctinfo, unsigned int hooknum, unsigned int hdrlen); +#if IS_ENABLED (CONFIG_NETFILTER )int nf_nat_ipv4_register_fn (struct net *net,const struct nf_hook_ops *ops);void nf_nat_ipv4_unregister_fn (struct net *net,const struct nf_hook_ops *ops);
@@ -104,6 +107,7 @@ void nf_nat_inet_unregister_fn(struct net *net, const struct nf_hook_ops *ops);unsigned int nf_nat_inet_fn (void *priv,struct sk_buff *skb,const struct nf_hook_state *state); +#endif int nf_xfrm_me_harder (struct net *n,struct sk_buff *s,unsigned int family);
include/net/netfilter/nf_queue.h +5 -0
@@ -15,7 +15,9 @@ struct nf_queue_entry {unsigned int id;unsigned int hook_index;/* index in hook_entries->hook[] */ +#if IS_ENABLED (CONFIG_NETFILTER )struct nf_hook_state state; +#endif u16 size;/* sizeof(entry) + saved route keys */ /* extra space to store route keys */
@@ -121,6 +123,9 @@ nfqueue_hash(const struct sk_buff *skb, u16 queue, u16 queues_total, u8 family, return queue; } +#if IS_ENABLED (CONFIG_NETFILTER )int nf_queue (struct sk_buff *skb,struct nf_hook_state *state,unsigned int index,unsigned int verdict); +#endif +#endif /* _NF_QUEUE_H */
include/net/netfilter/nf_synproxy.h +4 -0
@@ -20,8 +20,10 @@ bool synproxy_recv_client_ack(struct net *net,const struct tcphdr *th, struct synproxy_options *opts, u32 recv_seq); +#if IS_ENABLED (CONFIG_NETFILTER )unsigned int ipv4_synproxy_hook (void *priv,struct sk_buff *skb,const struct nf_hook_state *nhs); +#endif int nf_synproxy_ipv4_init (struct synproxy_net *snet,struct net *net);void nf_synproxy_ipv4_fini (struct synproxy_net *snet,struct net *net);
@@ -35,8 +37,10 @@ bool synproxy_recv_client_ack_ipv6(struct net *net, const struct sk_buff *skb,const struct tcphdr *th, struct synproxy_options *opts, u32 recv_seq); +#if IS_ENABLED (CONFIG_NETFILTER )unsigned int ipv6_synproxy_hook (void *priv,struct sk_buff *skb,const struct nf_hook_state *nhs); +#endif int nf_synproxy_ipv6_init (struct synproxy_net *snet,struct net *net);void nf_synproxy_ipv6_fini (struct synproxy_net *snet,struct net *net);#else
include/net/netfilter/nf_tables.h +8 -0
@@ -25,6 +25,7 @@ struct nft_pktinfo {struct xt_action_param xt; }; +#if IS_ENABLED (CONFIG_NETFILTER )static inline struct net *nft_net (const struct nft_pktinfo *pkt) {return pkt->xt.state->net;
@@ -57,6 +58,7 @@ static inline void nft_set_pktinfo(struct nft_pktinfo *pkt, pkt->skb = skb; pkt->xt.state = state; } +#endif static inline void nft_set_pktinfo_unspec (struct nft_pktinfo *pkt,struct sk_buff *skb)
@@ -927,9 +929,11 @@ struct nft_chain_type {int family;struct module *owner;unsigned int hook_mask; +#if IS_ENABLED (CONFIG_NETFILTER )nf_hookfn *hooks[NF_MAX_HOOKS ];int (*ops_register)(struct net *net,const struct nf_hook_ops *ops);void (*ops_unregister)(struct net *net,const struct nf_hook_ops *ops); +#endif }; int nft_chain_validate_dependency(const struct nft_chain *chain,
@@ -955,7 +959,9 @@ struct nft_stats {* @flow_block: flow block (for hardware offload) */ struct nft_base_chain { +#if IS_ENABLED (CONFIG_NETFILTER )struct nf_hook_ops ops; +#endif const struct nft_chain_type *type;u8 policy;u8 flags;
@@ -1152,7 +1158,9 @@ struct nft_flowtable { use:30 ;u64 handle;/* runtime data below here */ +#if IS_ENABLED (CONFIG_NETFILTER )struct nf_hook_ops *ops____cacheline_aligned ; +#endif struct nf_flowtable data; };
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 13/17 netfilter: remove "#ifdef __KERNEL__" guards from some headers.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
A number of non-UAPI Netfilter header-files contained superfluous "#ifdef __KERNEL__" guards. Removed them.
--- include/linux/netfilter/nf_conntrack_dccp.h | 3 --- include/linux/netfilter/nf_conntrack_h323.h | 4 ---- include/linux/netfilter/nf_conntrack_irc.h | 3 --- include/linux/netfilter/nf_conntrack_pptp.h | 3 --- include/linux/netfilter/nf_conntrack_proto_gre.h | 2 -- include/linux/netfilter/nf_conntrack_sane.h | 4 ---- include/linux/netfilter/nf_conntrack_sip.h | 2 -- 7 files changed, 21 deletions(-)
include/linux/netfilter/nf_conntrack_dccp.h +0 -3
@@ -25,7 +25,6 @@ enum ct_dccp_roles { };#define CT_DCCP_ROLE_MAX (__CT_DCCP_ROLE_MAX - 1) -#ifdef __KERNEL__#include <linux/netfilter/nf_conntrack_tuple_common.h> struct nf_ct_dccp {
@@ -36,6 +35,4 @@ struct nf_ct_dccp { u_int64_t handshake_seq; }; -#endif /* __KERNEL__ */ -#endif /* _NF_CONNTRACK_DCCP_H */
include/linux/netfilter/nf_conntrack_h323.h +0 -4
@@ -2,8 +2,6 @@#ifndef _NF_CONNTRACK_H323_H#define _NF_CONNTRACK_H323_H -#ifdef __KERNEL__ -#include <linux/netfilter.h> #include <linux/skbuff.h> #include <linux/types.h>
@@ -97,5 +95,3 @@ extern int (*nat_q931_hook) (struct sk_buff *skb, struct nf_conn *ct, struct nf_conntrack_expect *exp);#endif - -#endif
include/linux/netfilter/nf_conntrack_irc.h +0 -3
@@ -2,8 +2,6 @@#ifndef _NF_CONNTRACK_IRC_H#define _NF_CONNTRACK_IRC_H -#ifdef __KERNEL__ -#include <linux/netfilter.h> #include <linux/skbuff.h> #include <net/netfilter/nf_conntrack_expect.h>
@@ -17,5 +15,4 @@ extern unsigned int (*nf_nat_irc_hook)(struct sk_buff *skb,unsigned int matchlen, struct nf_conntrack_expect *exp); -#endif /* __KERNEL__ */ #endif /* _NF_CONNTRACK_IRC_H */
include/linux/netfilter/nf_conntrack_pptp.h +0 -3
@@ -50,8 +50,6 @@ struct nf_nat_pptp {__be16 pac_call_id;/* NAT'ed PAC call id */ }; -#ifdef __KERNEL__ -#define PPTP_CONTROL_PORT 1723#define PPTP_PACKET_CONTROL 1
@@ -324,5 +322,4 @@ extern void (*nf_nat_pptp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp); -#endif /* __KERNEL__ */ #endif /* _NF_CONNTRACK_PPTP_H */
include/linux/netfilter/nf_conntrack_proto_gre.h +0 -2
@@ -10,7 +10,6 @@ struct nf_ct_gre {unsigned int timeout; }; -#ifdef __KERNEL__#include <net/netfilter/nf_conntrack_tuple.h> struct nf_conn ;
@@ -32,5 +31,4 @@ void nf_ct_gre_keymap_destroy(struct nf_conn *ct);bool gre_pkt_to_tuple (const struct sk_buff *skb,unsigned int dataoff,struct net *net,struct nf_conntrack_tuple *tuple); -#endif /* __KERNEL__ */ #endif /* _CONNTRACK_PROTO_GRE_H */
include/linux/netfilter/nf_conntrack_sane.h +0 -4
@@ -3,8 +3,6 @@#define _NF_CONNTRACK_SANE_H/* SANE tracking. */ -#ifdef __KERNEL__ -#define SANE_PORT 6566enum sane_state {
@@ -17,6 +15,4 @@ struct nf_ct_sane_master { enum sane_state state; }; -#endif /* __KERNEL__ */ -#endif /* _NF_CONNTRACK_SANE_H */
include/linux/netfilter/nf_conntrack_sip.h +0 -2
@@ -1,7 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __NF_CONNTRACK_SIP_H__#define __NF_CONNTRACK_SIP_H__ -#ifdef __KERNEL__#include <linux/skbuff.h> #include <linux/types.h>
@@ -196,5 +195,4 @@ int ct_sip_get_sdp_header(const struct nf_conn *ct, const char *dptr,enum sdp_header_types term, unsigned int *matchoff, unsigned int *matchlen); -#endif /* __KERNEL__ */ #endif /* __NF_CONNTRACK_SIP_H__ */
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 14/17 kbuild: remove all netfilter headers from header-test blacklist.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
All the blacklisted NF headers can now be compiled stand-alone, so removed them from the blacklist.
--- include/Kbuild | 74 ---------------------------------------------------------- 1 file changed, 74 deletions(-)
include/Kbuild +0 -74
@@ -386,31 +386,6 @@ header-test- += linux/mvebu-pmsu.h header-test- += linux/mxm-wmi.h header-test- += linux/n_r3964.h header-test- += linux/ndctl.h -header-test- += linux/netfilter/ipset/ip_set.h -header-test- += linux/netfilter/ipset/ip_set_bitmap.h -header-test- += linux/netfilter/ipset/ip_set_comment.h -header-test- += linux/netfilter/ipset/ip_set_counter.h -header-test- += linux/netfilter/ipset/ip_set_getport.h -header-test- += linux/netfilter/ipset/ip_set_hash.h -header-test- += linux/netfilter/ipset/ip_set_list.h -header-test- += linux/netfilter/ipset/ip_set_skbinfo.h -header-test- += linux/netfilter/ipset/ip_set_timeout.h -header-test- += linux/netfilter/nf_conntrack_amanda.h -header-test- += linux/netfilter/nf_conntrack_ftp.h -header-test- += linux/netfilter/nf_conntrack_h323.h -header-test- += linux/netfilter/nf_conntrack_h323_asn1.h -header-test- += linux/netfilter/nf_conntrack_irc.h -header-test- += linux/netfilter/nf_conntrack_pptp.h -header-test- += linux/netfilter/nf_conntrack_proto_gre.h -header-test- += linux/netfilter/nf_conntrack_sip.h -header-test- += linux/netfilter/nf_conntrack_snmp.h -header-test- += linux/netfilter/nf_conntrack_tftp.h -header-test- += linux/netfilter/x_tables.h -header-test- += linux/netfilter_arp/arp_tables.h -header-test- += linux/netfilter_bridge/ebtables.h -header-test- += linux/netfilter_ipv4/ip4_tables.h -header-test- += linux/netfilter_ipv4/ip_tables.h -header-test- += linux/netfilter_ipv6/ip6_tables.h header-test- += linux/nfs.h header-test- += linux/nfs_fs_i.h header-test- += linux/nfs_fs_sb.h
@@ -874,43 +849,6 @@ header-test- += net/mpls_iptunnel.h header-test- += net/mrp.h header-test- += net/ncsi.h header-test- += net/netevent.h -header-test- += net/netfilter/br_netfilter.h -header-test- += net/netfilter/ipv4/nf_dup_ipv4.h -header-test- += net/netfilter/ipv6/nf_defrag_ipv6.h -header-test- += net/netfilter/ipv6/nf_dup_ipv6.h -header-test- += net/netfilter/nf_conntrack.h -header-test- += net/netfilter/nf_conntrack_acct.h -header-test- += net/netfilter/nf_conntrack_bridge.h -header-test- += net/netfilter/nf_conntrack_core.h -header-test- += net/netfilter/nf_conntrack_count.h -header-test- += net/netfilter/nf_conntrack_ecache.h -header-test- += net/netfilter/nf_conntrack_expect.h -header-test- += net/netfilter/nf_conntrack_extend.h -header-test- += net/netfilter/nf_conntrack_helper.h -header-test- += net/netfilter/nf_conntrack_l4proto.h -header-test- += net/netfilter/nf_conntrack_labels.h -header-test- += net/netfilter/nf_conntrack_seqadj.h -header-test- += net/netfilter/nf_conntrack_synproxy.h -header-test- += net/netfilter/nf_conntrack_timeout.h -header-test- += net/netfilter/nf_conntrack_timestamp.h -header-test- += net/netfilter/nf_conntrack_tuple.h -header-test- += net/netfilter/nf_dup_netdev.h -header-test- += net/netfilter/nf_flow_table.h -header-test- += net/netfilter/nf_nat.h -header-test- += net/netfilter/nf_nat_helper.h -header-test- += net/netfilter/nf_nat_masquerade.h -header-test- += net/netfilter/nf_nat_redirect.h -header-test- += net/netfilter/nf_queue.h -header-test- += net/netfilter/nf_reject.h -header-test- += net/netfilter/nf_synproxy.h -header-test-$(CONFIG_NF_TABLES) += net/netfilter/nf_tables.h -header-test-$(CONFIG_NF_TABLES) += net/netfilter/nf_tables_core.h -header-test-$(CONFIG_NF_TABLES) += net/netfilter/nf_tables_ipv4.h -header-test- += net/netfilter/nf_tables_ipv6.h -header-test-$(CONFIG_NF_TABLES) += net/netfilter/nf_tables_offload.h -header-test- += net/netfilter/nft_fib.h -header-test- += net/netfilter/nft_meta.h -header-test- += net/netfilter/nft_reject.h header-test- += net/netns/can.h header-test- += net/netns/generic.h header-test- += net/netns/ieee802154_6lowpan.h
@@ -1140,18 +1078,6 @@ header-test- += uapi/linux/kvm_para.h header-test- += uapi/linux/lightnvm.h header-test- += uapi/linux/mic_common.h header-test- += uapi/linux/mman.h -header-test- += uapi/linux/netfilter/ipset/ip_set_bitmap.h -header-test- += uapi/linux/netfilter/ipset/ip_set_hash.h -header-test- += uapi/linux/netfilter/ipset/ip_set_list.h -header-test- += uapi/linux/netfilter/nf_synproxy.h -header-test- += uapi/linux/netfilter/xt_policy.h -header-test- += uapi/linux/netfilter/xt_set.h -header-test- += uapi/linux/netfilter_arp/arp_tables.h -header-test- += uapi/linux/netfilter_arp/arpt_mangle.h -header-test- += uapi/linux/netfilter_ipv4/ip_tables.h -header-test- += uapi/linux/netfilter_ipv4/ipt_LOG.h -header-test- += uapi/linux/netfilter_ipv6/ip6_tables.h -header-test- += uapi/linux/netfilter_ipv6/ip6t_LOG.h header-test- += uapi/linux/nilfs2_ondisk.h header-test- += uapi/linux/patchkey.h header-test- += uapi/linux/ptrace.h
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 15/17 netfilter: nf_tables: add missing prototypes.
In reply to Pablo Neira AyusoFrom: Valdis Klētnieks <[email protected]>
Sparse rightly complains about undeclared symbols.
CHECK net/netfilter/nft_set_hash.cnet/netfilter/nft_set_hash.c:647:21: warning: symbol 'nft_set_rhash_type' was not declared. Should it be static? net/netfilter/nft_set_hash.c:670:21: warning: symbol 'nft_set_hash_type' was not declared. Should it be static? net/netfilter/nft_set_hash.c:690:21: warning: symbol 'nft_set_hash_fast_type' was not declared. Should it be static?
CHECK net/netfilter/nft_set_bitmap.cnet/netfilter/nft_set_bitmap.c:296:21: warning: symbol 'nft_set_bitmap_type' was not declared. Should it be static?
CHECK net/netfilter/nft_set_rbtree.cnet/netfilter/nft_set_rbtree.c:470:21: warning: symbol 'nft_set_rbtree_type' was not declared. Should it be static?
Include nf_tables_core.h rather than nf_tables.h to pick up the additional definitions.
--- net/netfilter/nft_set_bitmap.c | 2 +- net/netfilter/nft_set_hash.c | 2 +- net/netfilter/nft_set_rbtree.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nft_set_bitmap.c +1 -1
@@ -10,7 +10,7 @@#include <linux/netlink.h> #include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> -#include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_core.h> struct nft_bitmap_elem {struct list_head head;
net/netfilter/nft_set_hash.c +1 -1
@@ -16,7 +16,7 @@#include <linux/rhashtable.h> #include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> -#include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_core.h> /* We target a hash table size of 4, element hint is 75% of final size */ #define NFT_RHASH_ELEMENT_HINT 3
net/netfilter/nft_set_rbtree.c +1 -1
@@ -13,7 +13,7 @@#include <linux/netlink.h> #include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> -#include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_core.h> struct nft_rbtree {struct rb_root root;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 16/17 netfilter: nf_nat_proto: make tables static
In reply to Pablo Neira AyusoFrom: Valdis Klētnieks <[email protected]>
Sparse warns about two tables not being declared.
CHECK net/netfilter/nf_nat_proto.cnet/netfilter/nf_nat_proto.c:725:26: warning: symbol 'nf_nat_ipv4_ops' was not declared. Should it be static? net/netfilter/nf_nat_proto.c:964:26: warning: symbol 'nf_nat_ipv6_ops' was not declared. Should it be static?
And in fact they can indeed be static.
--- net/netfilter/nf_nat_proto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nf_nat_proto.c +2 -2
@@ -722,7 +722,7 @@ nf_nat_ipv4_local_fn(void *priv, struct sk_buff *skb,return ret; } -const struct nf_hook_ops nf_nat_ipv4_ops[] = { +static const struct nf_hook_ops nf_nat_ipv4_ops[] = {/* Before packet filtering, change destination */ { .hook = nf_nat_ipv4_in,
@@ -961,7 +961,7 @@ nf_nat_ipv6_local_fn(void *priv, struct sk_buff *skb,return ret; } -const struct nf_hook_ops nf_nat_ipv6_ops[] = { +static const struct nf_hook_ops nf_nat_ipv6_ops[] = {/* Before packet filtering, change destination */ { .hook = nf_nat_ipv6_in,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 17/17 netfilter: connlabels: prefer static lock initialiser
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
seen during boot:
BUG: spinlock bad magic on CPU#2, swapper/0/1 lock: nf_connlabels_lock+0x0/0x60, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0 Call Trace: do_raw_spin_lock+0x14e/0x1b0 nf_connlabels_get+0x15/0x40 ct_init_net+0xc4/0x270 ops_init+0x56/0x1c0 register_pernet_operations+0x1c8/0x350 register_pernet_subsys+0x1f/0x40 tcf_register_action+0x7c/0x1a0 do_one_initcall+0x13d/0x2d9
Problem is that ct action init function can run before connlabels_init(). Lock has not been initialised yet.
Fix it by using a static initialiser.
--- net/netfilter/nf_conntrack_labels.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/netfilter/nf_conntrack_labels.c +1 -2
@@ -11,7 +11,7 @@#include <net/netfilter/nf_conntrack_ecache.h> #include <net/netfilter/nf_conntrack_labels.h> -static spinlock_t nf_connlabels_lock; +static __read_mostly DEFINE_SPINLOCK (nf_connlabels_lock);static int replace_u32 (u32 *address,u32 mask,u32 new) {
@@ -89,7 +89,6 @@ int nf_conntrack_labels_init(void) {BUILD_BUG_ON (NF_CT_LABELS_MAX_SIZE /sizeof (long ) >=U8_MAX ); -spin_lock_init (&nf_connlabels_lock);return nf_ct_extend_register (&labels_extend); }
Signature · 1 line
2.11.0