Netfilter/IPVS updates for net-next
Subsystems (4)
Pablo Neira Ayuso
maintainercover Netfilter/IPVS updates for net-next
Hi,
The following patchset contains Netfilter/IPVS updates for net-next:
1) Rename mss field to mss_option field in synproxy, from Fernando Mancera.
2) Use SYSCTL_{ZERO,ONE} definitions in conntrack, from Matteo Croce.
3) More strict validation of IPVS sysctl values, from Junwei Hu.
4) Remove unnecessary spaces after on the right hand side of assignments, from yangxingwu.
5) Add offload support for bitwise operation.
6) Extend the nft_offload_reg structure to store immediate date.
7) Collapse several ip_set header files into ip_set.h, from Jeremy Sowden.
8) Make netfilter headers compile with CONFIG_KERNEL_HEADER_TEST=y, from Jeremy Sowden.
9) Fix several sparse warnings due to missing prototypes, from Valdis Kletnieks.
10) Use static lock initialiser to ensure connlabel spinlock is initialized on boot time to fix sched/act_ct.c, patch from Florian Westphal.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
Thanks.
----------------------------------------------------------------
The following changes since commit 4de97b0c86fcf9a225dff465f1614c834c2eeea6:
Merge branch 'enetc-PCIe-MDIO' (2019-08-02 18:22:18 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git HEAD
for you to fetch changes up to 105333435b4f3b21ffc325f32fae17719310db64:
netfilter: connlabels: prefer static lock initialiser (2019-08-13 12:15:45 +0200)
----------------------------------------------------------------
Fernando Fernandez Mancera (1):
netfilter: synproxy: rename mss synproxy_options field
Florian Westphal (1):
netfilter: connlabels: prefer static lock initialiser
Jeremy Sowden (8):
netfilter: inline four headers files into another one.
netfilter: add missing includes to a number of header-files.
netfilter: add missing IS_ENABLED(CONFIG_BRIDGE_NETFILTER) checks to header-file.
netfilter: add missing IS_ENABLED(CONFIG_NF_TABLES) check to header-file.
netfilter: add missing IS_ENABLED(CONFIG_NF_CONNTRACK) checks to some header-files.
netfilter: add missing IS_ENABLED(CONFIG_NETFILTER) checks to some header-files.
netfilter: remove "#ifdef __KERNEL__" guards from some headers.
kbuild: remove all netfilter headers from header-test blacklist.
Junwei Hu (1):
ipvs: Improve robustness to the ipvs sysctl
Matteo Croce (1):
netfilter: conntrack: use shared sysctl constants
Pablo Neira Ayuso (2):
netfilter: nft_bitwise: add offload support
netfilter: nf_tables: store data in offload context registers
Valdis Kletnieks (2):
netfilter: nf_tables: add missing prototypes.
netfilter: nf_nat_proto: make tables static
yangxingwu (1):
netfilter: remove unnecessary spaces
include/Kbuild | 74 ------- include/linux/netfilter/ipset/ip_set.h | 238 ++++++++++++++++++++++- include/linux/netfilter/ipset/ip_set_comment.h | 73 ------- include/linux/netfilter/ipset/ip_set_counter.h | 84 -------- include/linux/netfilter/ipset/ip_set_getport.h | 4 + include/linux/netfilter/ipset/ip_set_skbinfo.h | 42 ---- include/linux/netfilter/ipset/ip_set_timeout.h | 77 -------- include/linux/netfilter/nf_conntrack_amanda.h | 4 + include/linux/netfilter/nf_conntrack_dccp.h | 3 - include/linux/netfilter/nf_conntrack_ftp.h | 8 +- include/linux/netfilter/nf_conntrack_h323.h | 11 +- include/linux/netfilter/nf_conntrack_h323_asn1.h | 2 + include/linux/netfilter/nf_conntrack_irc.h | 5 +- include/linux/netfilter/nf_conntrack_pptp.h | 12 +- include/linux/netfilter/nf_conntrack_proto_gre.h | 2 - include/linux/netfilter/nf_conntrack_sane.h | 4 - include/linux/netfilter/nf_conntrack_sip.h | 6 +- include/linux/netfilter/nf_conntrack_snmp.h | 3 + include/linux/netfilter/nf_conntrack_tftp.h | 5 + 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 | 12 ++ include/net/netfilter/ipv4/nf_dup_ipv4.h | 3 + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 4 +- include/net/netfilter/ipv6/nf_dup_ipv6.h | 2 + include/net/netfilter/nf_conntrack.h | 10 + include/net/netfilter/nf_conntrack_acct.h | 13 ++ include/net/netfilter/nf_conntrack_bridge.h | 6 + include/net/netfilter/nf_conntrack_core.h | 3 + include/net/netfilter/nf_conntrack_count.h | 3 + include/net/netfilter/nf_conntrack_l4proto.h | 4 + include/net/netfilter/nf_conntrack_synproxy.h | 2 +- include/net/netfilter/nf_conntrack_timestamp.h | 6 + include/net/netfilter/nf_conntrack_tuple.h | 2 + include/net/netfilter/nf_dup_netdev.h | 2 + include/net/netfilter/nf_flow_table.h | 5 + include/net/netfilter/nf_nat.h | 4 + include/net/netfilter/nf_nat_helper.h | 4 +- include/net/netfilter/nf_nat_redirect.h | 3 + include/net/netfilter/nf_queue.h | 7 + include/net/netfilter/nf_reject.h | 3 + include/net/netfilter/nf_synproxy.h | 4 + include/net/netfilter/nf_tables.h | 12 ++ include/net/netfilter/nf_tables_ipv6.h | 1 + include/net/netfilter/nf_tables_offload.h | 1 + include/net/netfilter/nft_fib.h | 2 + include/net/netfilter/nft_meta.h | 2 + include/net/netfilter/nft_reject.h | 5 + include/uapi/linux/netfilter/xt_policy.h | 1 + net/ipv4/netfilter/ipt_SYNPROXY.c | 4 +- net/ipv6/netfilter/ip6t_SYNPROXY.c | 4 +- net/netfilter/ipset/ip_set_hash_gen.h | 4 +- net/netfilter/ipset/ip_set_list_set.c | 2 +- net/netfilter/ipvs/ip_vs_core.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 69 +++---- net/netfilter/ipvs/ip_vs_mh.c | 4 +- net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- net/netfilter/nf_conntrack_ftp.c | 2 +- net/netfilter/nf_conntrack_labels.c | 3 +- net/netfilter/nf_conntrack_proto_tcp.c | 2 +- net/netfilter/nf_conntrack_standalone.c | 34 ++-- net/netfilter/nf_nat_proto.c | 4 +- net/netfilter/nf_synproxy_core.c | 8 +- net/netfilter/nfnetlink_log.c | 4 +- net/netfilter/nfnetlink_queue.c | 4 +- net/netfilter/nft_bitwise.c | 19 ++ net/netfilter/nft_immediate.c | 24 ++- net/netfilter/nft_set_bitmap.c | 2 +- net/netfilter/nft_set_hash.c | 2 +- net/netfilter/nft_set_rbtree.c | 2 +- net/netfilter/nft_synproxy.c | 4 +- net/netfilter/xt_IDLETIMER.c | 2 +- net/netfilter/xt_set.c | 1 - 76 files changed, 527 insertions(+), 480 deletions(-) delete mode 100644 include/linux/netfilter/ipset/ip_set_comment.h delete mode 100644 include/linux/netfilter/ipset/ip_set_counter.h delete mode 100644 include/linux/netfilter/ipset/ip_set_skbinfo.h delete mode 100644 include/linux/netfilter/ipset/ip_set_timeout.h
Pablo Neira Ayuso
maintainerPATCH 1/17 netfilter: synproxy: rename mss synproxy_options field
From: Fernando Fernandez Mancera <[email protected]>
After introduce "mss_encode" field in the synproxy_options struct the field "mss" is a little confusing. It has been renamed to "mss_option".
--- include/net/netfilter/nf_conntrack_synproxy.h | 2 +- net/ipv4/netfilter/ipt_SYNPROXY.c | 4 ++-- net/ipv6/netfilter/ip6t_SYNPROXY.c | 4 ++-- net/netfilter/nf_synproxy_core.c | 8 ++++---- net/netfilter/nft_synproxy.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-)
include/net/netfilter/nf_conntrack_synproxy.h +1 -1
@@ -67,7 +67,7 @@ static inline struct synproxy_net *synproxy_pernet(struct net *net)struct synproxy_options {u8 options;u8 wscale; -u16 mss; +u16 mss_option;u16 mss_encode;u32 tsval;u32 tsecr;
net/ipv4/netfilter/ipt_SYNPROXY.c +2 -2
@@ -36,8 +36,8 @@ synproxy_tg4(struct sk_buff *skb, const struct xt_action_param *par) opts.options |=XT_SYNPROXY_OPT_ECN ; opts.options &= info->options; - opts.mss_encode = opts.mss; - opts.mss = info->mss; + opts.mss_encode = opts.mss_option; + opts.mss_option = info->mss;if (opts.options &XT_SYNPROXY_OPT_TIMESTAMP )synproxy_init_timestamp_cookie (info, &opts);else
net/ipv6/netfilter/ip6t_SYNPROXY.c +2 -2
@@ -36,8 +36,8 @@ synproxy_tg6(struct sk_buff *skb, const struct xt_action_param *par) opts.options |=XT_SYNPROXY_OPT_ECN ; opts.options &= info->options; - opts.mss_encode = opts.mss; - opts.mss = info->mss; + opts.mss_encode = opts.mss_option; + opts.mss_option = info->mss;if (opts.options &XT_SYNPROXY_OPT_TIMESTAMP )synproxy_init_timestamp_cookie (info, &opts);else
net/netfilter/nf_synproxy_core.c +4 -4
@@ -56,7 +56,7 @@ synproxy_parse_options(const struct sk_buff *skb, unsigned int doff,switch (opcode) {case TCPOPT_MSS :if (opsize ==TCPOLEN_MSS ) { - opts->mss =get_unaligned_be16 (ptr); + opts->mss_option =get_unaligned_be16 (ptr); opts->options |=NF_SYNPROXY_OPT_MSS ; }break ;
@@ -115,7 +115,7 @@ synproxy_build_options(struct tcphdr *th, const struct synproxy_options *opts)if (options &NF_SYNPROXY_OPT_MSS ) *ptr++ =htonl ((TCPOPT_MSS <<24 ) | (TCPOLEN_MSS <<16 ) | - opts->mss); + opts->mss_option);if (options &NF_SYNPROXY_OPT_TIMESTAMP ) {if (options &NF_SYNPROXY_OPT_SACK_PERM )
@@ -642,7 +642,7 @@ synproxy_recv_client_ack(struct net *net, }this_cpu_inc (snet->stats->cookie_valid); - opts->mss = mss; + opts->mss_option = mss; opts->options |=NF_SYNPROXY_OPT_MSS ;if (opts->options &NF_SYNPROXY_OPT_TIMESTAMP )
@@ -1060,7 +1060,7 @@ synproxy_recv_client_ack_ipv6(struct net *net, }this_cpu_inc (snet->stats->cookie_valid); - opts->mss = mss; + opts->mss_option = mss; opts->options |=NF_SYNPROXY_OPT_MSS ;if (opts->options &NF_SYNPROXY_OPT_TIMESTAMP )
net/netfilter/nft_synproxy.c +2 -2
@@ -31,8 +31,8 @@ static void nft_synproxy_tcp_options(struct synproxy_options *opts, opts->options |=NF_SYNPROXY_OPT_ECN ; opts->options &= priv->info.options; - opts->mss_encode = opts->mss; - opts->mss = info->mss; + opts->mss_encode = opts->mss_option; + opts->mss_option = info->mss;if (opts->options &NF_SYNPROXY_OPT_TIMESTAMP )synproxy_init_timestamp_cookie (info, opts);else
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/17 netfilter: conntrack: use shared sysctl constants
In reply to Pablo Neira AyusoFrom: Matteo Croce <[email protected]>
Use shared sysctl variables for zero and one constants, as in commit eec4844fae7c ("proc/sysctl: add shared variables for range check")
--- net/netfilter/nf_conntrack_standalone.c | 34 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 18 deletions(-)
net/netfilter/nf_conntrack_standalone.c +16 -18
@@ -511,8 +511,6 @@ static void nf_conntrack_standalone_fini_proc(struct net *net)/* Log invalid packets of a given protocol */ static int log_invalid_proto_min__read_mostly ;static int log_invalid_proto_max__read_mostly =255 ; -static int zero; -static int one =1 ;/* size the user *wants to set */ static unsigned int nf_conntrack_htable_size_user__read_mostly ;
@@ -629,8 +627,8 @@ static struct ctl_table nf_ct_sysctl_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &zero, - .extra2 = &one, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, }, [NF_SYSCTL_CT_LOG_INVALID] = { .procname = "nf_conntrack_log_invalid",
@@ -654,8 +652,8 @@ static struct ctl_table nf_ct_sysctl_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &zero, - .extra2 = &one, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, }, [NF_SYSCTL_CT_HELPER] = { .procname = "nf_conntrack_helper",
@@ -663,8 +661,8 @@ static struct ctl_table nf_ct_sysctl_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &zero, - .extra2 = &one, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, }, #ifdef CONFIG_NF_CONNTRACK_EVENTS [NF_SYSCTL_CT_EVENTS] = {
@@ -673,8 +671,8 @@ static struct ctl_table nf_ct_sysctl_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &zero, - .extra2 = &one, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, },#endif #ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
@@ -684,8 +682,8 @@ static struct ctl_table nf_ct_sysctl_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &zero, - .extra2 = &one, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, }, #endif [NF_SYSCTL_CT_PROTO_TIMEOUT_GENERIC] = {
@@ -759,16 +757,16 @@ static struct ctl_table nf_ct_sysctl_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &zero, - .extra2 = &one, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, }, [NF_SYSCTL_CT_PROTO_TCP_LIBERAL] = { .procname = "nf_conntrack_tcp_be_liberal", .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &zero, - .extra2 = &one, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, }, [NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS] = { .procname = "nf_conntrack_tcp_max_retrans",
@@ -904,8 +902,8 @@ static struct ctl_table nf_ct_sysctl_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &zero, - .extra2 = &one, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, },#endif #ifdef CONFIG_NF_CT_PROTO_GRE
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/17 ipvs: Improve robustness to the ipvs sysctl
In reply to Pablo Neira AyusoFrom: Junwei Hu <[email protected]>
The ipvs module parse the user buffer and save it to sysctl, then check if the value is valid. invalid value occurs over a period of time.
Here, I add a variable, struct ctl_table tmp, used to read the value from the user buffer, and save only when it is valid. I delete proc_do_sync_mode and use extra1/2 in table for the proc_dointvec_minmax call.
--- net/netfilter/ipvs/ip_vs_ctl.c | 69 +++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 34 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +35 -34
@@ -1737,12 +1737,18 @@ proc_do_defense_mode(struct ctl_table *table, int write,int val = *valp;int rc; - rc =proc_dointvec (table, write, buffer, lenp, ppos); +struct ctl_table tmp = { + .data = &val, + .maxlen =sizeof (int ), + .mode = table->mode, + }; + + rc =proc_dointvec (&tmp, write, buffer, lenp, ppos);if (write && (*valp != val)) { -if ((*valp <0 ) || (*valp >3 )) { -/* Restore the correct value */ - *valp = val; +if (val <0 || val >3 ) { + rc = -EINVAL ; }else { + *valp = val;update_defense_level (ipvs); } }
@@ -1756,33 +1762,20 @@ proc_do_sync_threshold(struct ctl_table *table, int write,int *valp = table->data;int val[2 ];int rc; +struct ctl_table tmp = { + .data = &val, + .maxlen = table->maxlen, + .mode = table->mode, + }; -/* backup the value first */ memcpy (val, valp,sizeof (val)); - - rc =proc_dointvec (table, write, buffer, lenp, ppos); -if (write && (valp[0 ] <0 || valp[1 ] <0 || - (valp[0 ] >= valp[1 ] && valp[1 ]))) { -/* Restore the correct value */ -memcpy (valp, val,sizeof (val)); - } -return rc; -} - -static int -proc_do_sync_mode (struct ctl_table *table,int write, -void __user *buffer,size_t *lenp,loff_t *ppos) -{ -int *valp = table->data; -int val = *valp; -int rc; - - rc =proc_dointvec (table, write, buffer, lenp, ppos); -if (write && (*valp != val)) { -if ((*valp <0 ) || (*valp >1 )) { -/* Restore the correct value */ - *valp = val; - } + rc =proc_dointvec (&tmp, write, buffer, lenp, ppos); +if (write) { +if (val[0 ] <0 || val[1 ] <0 || + (val[0 ] >= val[1 ] && val[1 ])) + rc = -EINVAL ; +else +memcpy (valp, val,sizeof (val)); }return rc; }
@@ -1795,12 +1788,18 @@ proc_do_sync_ports(struct ctl_table *table, int write,int val = *valp;int rc; - rc =proc_dointvec (table, write, buffer, lenp, ppos); +struct ctl_table tmp = { + .data = &val, + .maxlen =sizeof (int ), + .mode = table->mode, + }; + + rc =proc_dointvec (&tmp, write, buffer, lenp, ppos);if (write && (*valp != val)) { -if (*valp <1 || !is_power_of_2 (*valp)) { -/* Restore the correct value */ +if (val <1 || !is_power_of_2 (val)) + rc = -EINVAL ; +else *valp = val; - } }return rc; }
@@ -1860,7 +1859,9 @@ static struct ctl_table vs_vars[] = { .procname = "sync_version", .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_do_sync_mode, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, }, { .procname = "sync_ports",
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/17 netfilter: remove unnecessary spaces
In reply to Pablo Neira AyusoFrom: yangxingwu <[email protected]>
This patch removes extra spaces.
--- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- net/netfilter/ipset/ip_set_list_set.c | 2 +- net/netfilter/ipvs/ip_vs_core.c | 2 +- net/netfilter/ipvs/ip_vs_mh.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- net/netfilter/nf_conntrack_ftp.c | 2 +- net/netfilter/nf_conntrack_proto_tcp.c | 2 +- net/netfilter/nfnetlink_log.c | 4 ++-- net/netfilter/nfnetlink_queue.c | 4 ++-- net/netfilter/xt_IDLETIMER.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-)
net/netfilter/ipset/ip_set_hash_gen.h +1 -1
@@ -953,7 +953,7 @@ mtype_test_cidrs(struct ip_set *set, struct mtype_elem *d,mtype_data_netmask (d,NCIDR_GET (h->nets[j].cidr[0 ]));#endif key =HKEY (d, h->initval, t->htable_bits); - n =rcu_dereference_bh (hbucket (t, key)); + n =rcu_dereference_bh (hbucket (t, key));if (!n)continue ;for (i =0 ; i < n->pos; i++) {
net/netfilter/ipset/ip_set_list_set.c +1 -1
@@ -288,7 +288,7 @@ list_set_uadd(struct ip_set *set, void *value, const struct ip_set_ext *ext,if (n && !(SET_WITH_TIMEOUT (set) &&ip_set_timeout_expired (ext_timeout (n, set)))) - n =NULL ; + n =NULL ; e =kzalloc (set->dsize,GFP_ATOMIC );if (!e)
net/netfilter/ipvs/ip_vs_core.c +1 -1
@@ -617,7 +617,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,unsigned int flags = (svc->flags &IP_VS_SVC_F_ONEPACKET && iph->protocol ==IPPROTO_UDP ) ?IP_VS_CONN_F_ONE_PACKET :0 ; -union nf_inet_addr daddr = { .all = {0 ,0 ,0 ,0 } }; +union nf_inet_addr daddr = { .all = {0 ,0 ,0 ,0 } };/* create a new connection entry */ IP_VS_DBG (6 ,"%s(): create a cache_bypass entry\n" , __func__);
net/netfilter/ipvs/ip_vs_mh.c +2 -2
@@ -174,8 +174,8 @@ static int ip_vs_mh_populate(struct ip_vs_mh_state *s,return 0 ; } - table =kcalloc (BITS_TO_LONGS (IP_VS_MH_TAB_SIZE ), -sizeof (unsigned long ),GFP_KERNEL ); + table =kcalloc (BITS_TO_LONGS (IP_VS_MH_TAB_SIZE ), +sizeof (unsigned long ),GFP_KERNEL );if (!table)return -ENOMEM ;
net/netfilter/ipvs/ip_vs_proto_tcp.c +1 -1
@@ -710,7 +710,7 @@ static int __ip_vs_tcp_init(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd sizeof(tcp_timeouts));if (!pd->timeout_table)return -ENOMEM ; - pd->tcp_state_table = tcp_states; + pd->tcp_state_table = tcp_states;return 0 ; }
net/netfilter/nf_conntrack_ftp.c +1 -1
@@ -162,7 +162,7 @@ static int try_rfc959(const char *data, size_t dlen,if (length ==0 )return 0 ; - cmd->u3.ip =htonl ((array[0 ] <<24 ) | (array[1 ] <<16 ) | + cmd->u3.ip =htonl ((array[0 ] <<24 ) | (array[1 ] <<16 ) | (array[2 ] <<8 ) | array[3 ]); cmd->u.tcp.port =htons ((array[4 ] <<8 ) | array[5 ]);return length;
net/netfilter/nf_conntrack_proto_tcp.c +1 -1
@@ -1227,7 +1227,7 @@ static const struct nla_policy tcp_nla_policy[CTA_PROTOINFO_TCP_MAX+1] = { [CTA_PROTOINFO_TCP_WSCALE_ORIGINAL] = { .type = NLA_U8 }, [CTA_PROTOINFO_TCP_WSCALE_REPLY] = { .type = NLA_U8 }, [CTA_PROTOINFO_TCP_FLAGS_ORIGINAL] = { .len = sizeof(struct nf_ct_tcp_flags) }, - [CTA_PROTOINFO_TCP_FLAGS_REPLY] = { .len = sizeof(struct nf_ct_tcp_flags) }, + [CTA_PROTOINFO_TCP_FLAGS_REPLY] = { .len = sizeof(struct nf_ct_tcp_flags) }, };#define TCP_NLATTR_SIZE ( \
net/netfilter/nfnetlink_log.c +2 -2
@@ -651,7 +651,7 @@ nfulnl_log_packet(struct net *net,/* FIXME: do we want to make the size calculation conditional based on * what is actually present? way more branches and checks, but more * memory efficient... */ - size =nlmsg_total_size (sizeof (struct nfgenmsg )) + size =nlmsg_total_size (sizeof (struct nfgenmsg )) +nla_total_size (sizeof (struct nfulnl_msg_packet_hdr )) +nla_total_size (sizeof (u_int32_t))/* ifindex */ +nla_total_size (sizeof (u_int32_t))/* ifindex */
@@ -668,7 +668,7 @@ nfulnl_log_packet(struct net *net, +nla_total_size (sizeof (struct nfgenmsg ));/* NLMSG_DONE */ if (in &&skb_mac_header_was_set (skb)) { - size +=nla_total_size (skb->dev->hard_header_len) + size +=nla_total_size (skb->dev->hard_header_len) +nla_total_size (sizeof (u_int16_t))/* hwtype */ +nla_total_size (sizeof (u_int16_t));/* hwlen */ }
net/netfilter/nfnetlink_queue.c +2 -2
@@ -394,7 +394,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,char *secdata =NULL ;u32 seclen =0 ; - size =nlmsg_total_size (sizeof (struct nfgenmsg )) + size =nlmsg_total_size (sizeof (struct nfgenmsg )) +nla_total_size (sizeof (struct nfqnl_msg_packet_hdr )) +nla_total_size (sizeof (u_int32_t))/* ifindex */ +nla_total_size (sizeof (u_int32_t))/* ifindex */
@@ -453,7 +453,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, }if (queue->flags &NFQA_CFG_F_UID_GID ) { - size += (nla_total_size (sizeof (u_int32_t))/* uid */ + size += (nla_total_size (sizeof (u_int32_t))/* uid */ +nla_total_size (sizeof (u_int32_t)));/* gid */ }
net/netfilter/xt_IDLETIMER.c +1 -1
@@ -283,7 +283,7 @@ static int __init idletimer_tg_init(void) idletimer_tg_kobj = &idletimer_tg_device->kobj; - err =xt_register_target (&idletimer_tg); + err =xt_register_target (&idletimer_tg);if (err <0 ) {pr_debug ("couldn't register xt target\n" ); goto out_dev;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/17 netfilter: nft_bitwise: add offload support
In reply to Pablo Neira AyusoExtract mask from bitwise operation and store it into the corresponding context register so the cmp instruction can set the mask accordingly.
--- net/netfilter/nft_bitwise.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
net/netfilter/nft_bitwise.c +19 -0
@@ -13,6 +13,7 @@#include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> #include <net/netfilter/nf_tables.h> +#include <net/netfilter/nf_tables_offload.h> struct nft_bitwise {enum nft_registers sreg:8 ;
@@ -126,12 +127,30 @@ static int nft_bitwise_dump(struct sk_buff *skb, const struct nft_expr *expr)return -1 ; } +static struct nft_data zero; + +static int nft_bitwise_offload (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_expr *expr) +{ +const struct nft_bitwise *priv =nft_expr_priv (expr); + +if (memcmp (&priv->xor, &zero,sizeof (priv->xor) || + priv->sreg != priv->dreg)) +return -EOPNOTSUPP ; + +memcpy (&ctx->regs[priv->dreg].mask, &priv->mask,sizeof (priv->mask)); + +return 0 ; +} +static const struct nft_expr_ops nft_bitwise_ops = { .type = &nft_bitwise_type, .size =NFT_EXPR_SIZE (sizeof (struct nft_bitwise )), .eval = nft_bitwise_eval, .init = nft_bitwise_init, .dump = nft_bitwise_dump, + .offload = nft_bitwise_offload, };struct nft_expr_type nft_bitwise_type__read_mostly = {
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 6/17 netfilter: nf_tables: store data in offload context registers
In reply to Pablo Neira AyusoStore immediate data into offload context register. This allows follow up instructions to take it from the corresponding source register.
This patch is required to support for payload mangling, although other instructions that take data from source register will benefit from this too.
--- include/net/netfilter/nf_tables_offload.h | 1 + net/netfilter/nft_immediate.c | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-)
include/net/netfilter/nf_tables_offload.h +1 -0
@@ -9,6 +9,7 @@ struct nft_offload_reg {u32 len;u32 base_offset;u32 offset; +struct nft_data data;struct nft_data mask; };
net/netfilter/nft_immediate.c +17 -7
@@ -125,17 +125,13 @@ static int nft_immediate_validate(const struct nft_ctx *ctx,return 0 ; } -static int nft_immediate_offload (struct nft_offload_ctx *ctx, -struct nft_flow_rule *flow, -const struct nft_expr *expr) +static int nft_immediate_offload_verdict (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_immediate_expr *priv) { -const struct nft_immediate_expr *priv =nft_expr_priv (expr);struct flow_action_entry *entry;const struct nft_data *data; -if (priv->dreg !=NFT_REG_VERDICT ) -return -EOPNOTSUPP ; - entry = &flow->rule->action.entries[ctx->num_actions++]; data = &priv->data;
@@ -153,6 +149,20 @@ static int nft_immediate_offload(struct nft_offload_ctx *ctx,return 0 ; } +static int nft_immediate_offload (struct nft_offload_ctx *ctx, +struct nft_flow_rule *flow, +const struct nft_expr *expr) +{ +const struct nft_immediate_expr *priv =nft_expr_priv (expr); + +if (priv->dreg ==NFT_REG_VERDICT ) +return nft_immediate_offload_verdict (ctx, flow, priv); + +memcpy (&ctx->regs[priv->dreg].data, &priv->data,sizeof (priv->data)); + +return 0 ; +} +static const struct nft_expr_ops nft_imm_ops = { .type = &nft_imm_type, .size =NFT_EXPR_SIZE (sizeof (struct nft_immediate_expr )),
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 7/17 netfilter: inline four headers files into another one.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
linux/netfilter/ipset/ip_set.h included four other header files:
include/linux/netfilter/ipset/ip_set_comment.h
include/linux/netfilter/ipset/ip_set_counter.h
include/linux/netfilter/ipset/ip_set_skbinfo.h
include/linux/netfilter/ipset/ip_set_timeout.h
Of these the first three were not included anywhere else. The last, ip_set_timeout.h, was included in a couple of other places, but defined inline functions which call other inline functions defined in ip_set.h, so ip_set.h had to be included before it.
Inlined all four into ip_set.h, and updated the other files that included ip_set_timeout.h.
--- include/linux/netfilter/ipset/ip_set.h | 238 ++++++++++++++++++++++++- include/linux/netfilter/ipset/ip_set_comment.h | 73 -------- include/linux/netfilter/ipset/ip_set_counter.h | 84 --------- include/linux/netfilter/ipset/ip_set_skbinfo.h | 42 ----- include/linux/netfilter/ipset/ip_set_timeout.h | 77 -------- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- net/netfilter/xt_set.c | 1 - 7 files changed, 235 insertions(+), 282 deletions(-) delete mode 100644 include/linux/netfilter/ipset/ip_set_comment.h delete mode 100644 include/linux/netfilter/ipset/ip_set_counter.h delete mode 100644 include/linux/netfilter/ipset/ip_set_skbinfo.h delete mode 100644 include/linux/netfilter/ipset/ip_set_timeout.h
include/linux/netfilter/ipset/ip_set.h +234 -4
@@ -452,10 +452,240 @@ bitmap_bytes(u32 a, u32 b)return 4 * ((((b - a +8 ) /8 ) +3 ) /4 ); } -#include <linux/netfilter/ipset/ip_set_timeout.h> -#include <linux/netfilter/ipset/ip_set_comment.h> -#include <linux/netfilter/ipset/ip_set_counter.h> -#include <linux/netfilter/ipset/ip_set_skbinfo.h> +/* How often should the gc be run by default */ +#define IPSET_GC_TIME (3 * 60) + +/* Timeout period depending on the timeout value of the given set */ +#define IPSET_GC_PERIOD (timeout) \ + ((timeout/3) ? min_t(u32, (timeout)/3, IPSET_GC_TIME) : 1) + +/* Entry is set with no timeout value */ +#define IPSET_ELEM_PERMANENT 0 + +/* Set is defined with timeout support: timeout value may be 0 */ +#define IPSET_NO_TIMEOUT UINT_MAX + +/* Max timeout value, see msecs_to_jiffies() in jiffies.h */ +#define IPSET_MAX_TIMEOUT (UINT_MAX >> 1)/MSEC_PER_SEC + +#define ip_set_adt_opt_timeout (opt, set) \ +((opt)->ext.timeout != IPSET_NO_TIMEOUT ? (opt)->ext.timeout : (set)->timeout) + +static inline unsigned int +ip_set_timeout_uget (struct nlattr *tb) +{ +unsigned int timeout =ip_set_get_h32 (tb); + +/* Normalize to fit into jiffies */ +if (timeout >IPSET_MAX_TIMEOUT ) + timeout =IPSET_MAX_TIMEOUT ; + +return timeout; +} + +static inline bool +ip_set_timeout_expired (const unsigned long *t) +{ +return *t !=IPSET_ELEM_PERMANENT &&time_is_before_jiffies (*t); +} + +static inline void +ip_set_timeout_set (unsigned long *timeout,u32 value) +{ +unsigned long t; + +if (!value) { + *timeout =IPSET_ELEM_PERMANENT ; +return ; + } + + t =msecs_to_jiffies (value *MSEC_PER_SEC ) + jiffies; +if (t ==IPSET_ELEM_PERMANENT ) +/* Bingo! :-) */ + t--; + *timeout = t; +} + +static inline u32 +ip_set_timeout_get (const unsigned long *timeout) +{ +u32 t; + +if (*timeout ==IPSET_ELEM_PERMANENT ) +return 0 ; + + t =jiffies_to_msecs (*timeout - jiffies)/MSEC_PER_SEC ; +/* Zero value in userspace means no timeout */ +return t ==0 ?1 : t; +} + +static inline char * +ip_set_comment_uget (struct nlattr *tb) +{ +return nla_data (tb); +} + +/* Called from uadd only, protected by the set spinlock. +* The kadt functions don't use the comment extensions in any way. +*/ +static inline void +ip_set_init_comment (struct ip_set *set,struct ip_set_comment *comment, +const struct ip_set_ext *ext) +{ +struct ip_set_comment_rcu *c =rcu_dereference_protected (comment->c,1 ); +size_t len = ext->comment ?strlen (ext->comment) :0 ; + +if (unlikely (c)) { + set->ext_size -=sizeof (*c) +strlen (c->str) +1 ; +kfree_rcu (c, rcu); +rcu_assign_pointer (comment->c,NULL ); + } +if (!len) +return ; +if (unlikely (len >IPSET_MAX_COMMENT_SIZE )) + len =IPSET_MAX_COMMENT_SIZE ; + c =kmalloc (sizeof (*c) + len +1 ,GFP_ATOMIC ); +if (unlikely (!c)) +return ; +strlcpy (c->str, ext->comment, len +1 ); + set->ext_size +=sizeof (*c) +strlen (c->str) +1 ; +rcu_assign_pointer (comment->c, c); +} + +/* Used only when dumping a set, protected by rcu_read_lock() */ +static inline int +ip_set_put_comment (struct sk_buff *skb,const struct ip_set_comment *comment) +{ +struct ip_set_comment_rcu *c =rcu_dereference (comment->c); + +if (!c) +return 0 ; +return nla_put_string (skb,IPSET_ATTR_COMMENT , c->str); +} + +/* Called from uadd/udel, flush or the garbage collectors protected +* by the set spinlock. +* Called when the set is destroyed and when there can't be any user +* of the set data anymore. +*/ +static inline void +ip_set_comment_free (struct ip_set *set,struct ip_set_comment *comment) +{ +struct ip_set_comment_rcu *c; + + c =rcu_dereference_protected (comment->c,1 ); +if (unlikely (!c)) +return ; + set->ext_size -=sizeof (*c) +strlen (c->str) +1 ; +kfree_rcu (c, rcu); +rcu_assign_pointer (comment->c,NULL ); +} + +static inline void +ip_set_add_bytes (u64 bytes,struct ip_set_counter *counter) +{ +atomic64_add ((long long )bytes, &(counter)->bytes); +} + +static inline void +ip_set_add_packets (u64 packets,struct ip_set_counter *counter) +{ +atomic64_add ((long long )packets, &(counter)->packets); +} + +static inline u64 +ip_set_get_bytes (const struct ip_set_counter *counter) +{ +return (u64 )atomic64_read (&(counter)->bytes); +} + +static inline u64 +ip_set_get_packets (const struct ip_set_counter *counter) +{ +return (u64 )atomic64_read (&(counter)->packets); +} + +static inline bool +ip_set_match_counter (u64 counter,u64 match,u8 op) +{ +switch (op) { +case IPSET_COUNTER_NONE : +return true; +case IPSET_COUNTER_EQ : +return counter == match; +case IPSET_COUNTER_NE : +return counter != match; +case IPSET_COUNTER_LT : +return counter < match; +case IPSET_COUNTER_GT : +return counter > match; + } +return false; +} + +static inline void +ip_set_update_counter (struct ip_set_counter *counter, +const struct ip_set_ext *ext,u32 flags) +{ +if (ext->packets !=ULLONG_MAX && + !(flags &IPSET_FLAG_SKIP_COUNTER_UPDATE )) { +ip_set_add_bytes (ext->bytes, counter); +ip_set_add_packets (ext->packets, counter); + } +} + +static inline bool +ip_set_put_counter (struct sk_buff *skb,const struct ip_set_counter *counter) +{ +return nla_put_net64 (skb,IPSET_ATTR_BYTES , +cpu_to_be64 (ip_set_get_bytes (counter)), +IPSET_ATTR_PAD ) || +nla_put_net64 (skb,IPSET_ATTR_PACKETS , +cpu_to_be64 (ip_set_get_packets (counter)), +IPSET_ATTR_PAD ); +} + +static inline void +ip_set_init_counter (struct ip_set_counter *counter, +const struct ip_set_ext *ext) +{ +if (ext->bytes !=ULLONG_MAX ) +atomic64_set (&(counter)->bytes, (long long )(ext->bytes)); +if (ext->packets !=ULLONG_MAX ) +atomic64_set (&(counter)->packets, (long long )(ext->packets)); +} + +static inline void +ip_set_get_skbinfo (struct ip_set_skbinfo *skbinfo, +const struct ip_set_ext *ext, +struct ip_set_ext *mext,u32 flags) +{ + mext->skbinfo = *skbinfo; +} + +static inline bool +ip_set_put_skbinfo (struct sk_buff *skb,const struct ip_set_skbinfo *skbinfo) +{ +/* Send nonzero parameters only */ +return ((skbinfo->skbmark || skbinfo->skbmarkmask) && +nla_put_net64 (skb,IPSET_ATTR_SKBMARK , +cpu_to_be64 ((u64 )skbinfo->skbmark <<32 | + skbinfo->skbmarkmask), +IPSET_ATTR_PAD )) || + (skbinfo->skbprio && +nla_put_net32 (skb,IPSET_ATTR_SKBPRIO , +cpu_to_be32 (skbinfo->skbprio))) || + (skbinfo->skbqueue && +nla_put_net16 (skb,IPSET_ATTR_SKBQUEUE , +cpu_to_be16 (skbinfo->skbqueue))); +} + +static inline void +ip_set_init_skbinfo (struct ip_set_skbinfo *skbinfo, +const struct ip_set_ext *ext) +{ + *skbinfo = ext->skbinfo; +}#define IP_SET_INIT_KEXT (skb, opt, set) \ { .bytes = (skb)->len, .packets = 1, \
include/linux/netfilter/ipset/ip_set_comment.h deleted +0 -73
73 lines not on this page · raw message
include/linux/netfilter/ipset/ip_set_counter.h deleted +0 -84
84 lines not on this page · raw message
include/linux/netfilter/ipset/ip_set_skbinfo.h deleted +0 -42
42 lines not on this page · raw message
include/linux/netfilter/ipset/ip_set_timeout.h deleted +0 -77
77 lines not on this page · raw message
net/netfilter/ipset/ip_set_hash_gen.h +1 -1
@@ -7,7 +7,7 @@#include <linux/rcupdate.h> #include <linux/jhash.h> #include <linux/types.h> -#include <linux/netfilter/ipset/ip_set_timeout.h> +#include <linux/netfilter/ipset/ip_set.h> #define __ipset_dereference_protected (p, c) rcu_dereference_protected(p, c)#define ipset_dereference_protected (p, set) \
net/netfilter/xt_set.c +0 -1
@@ -14,7 +14,6 @@#include <linux/netfilter/x_tables.h> #include <linux/netfilter/ipset/ip_set.h> -#include <linux/netfilter/ipset/ip_set_timeout.h> #include <uapi/linux/netfilter/xt_set.h> MODULE_LICENSE ("GPL" );
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 8/17 netfilter: add missing includes to a number of header-files.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
A number of netfilter header-files used declarations and definitions from other headers without including them. Added include directives to make those declarations and definitions available.
--- include/linux/netfilter/ipset/ip_set_getport.h | 4 ++++ include/linux/netfilter/nf_conntrack_amanda.h | 4 ++++ include/linux/netfilter/nf_conntrack_ftp.h | 8 +++++--- include/linux/netfilter/nf_conntrack_h323.h | 7 +++++-- include/linux/netfilter/nf_conntrack_h323_asn1.h | 2 ++ include/linux/netfilter/nf_conntrack_irc.h | 4 ++++ include/linux/netfilter/nf_conntrack_pptp.h | 9 +++++---- include/linux/netfilter/nf_conntrack_sip.h | 4 ++-- include/linux/netfilter/nf_conntrack_snmp.h | 3 +++ include/linux/netfilter/nf_conntrack_tftp.h | 5 +++++ include/net/netfilter/br_netfilter.h | 2 ++ include/net/netfilter/ipv4/nf_dup_ipv4.h | 3 +++ include/net/netfilter/ipv6/nf_defrag_ipv6.h | 4 +++- include/net/netfilter/ipv6/nf_dup_ipv6.h | 2 ++ include/net/netfilter/nf_conntrack_bridge.h | 4 ++++ include/net/netfilter/nf_conntrack_count.h | 3 +++ include/net/netfilter/nf_dup_netdev.h | 2 ++ include/net/netfilter/nf_flow_table.h | 1 + include/net/netfilter/nf_nat_helper.h | 4 ++-- include/net/netfilter/nf_nat_redirect.h | 3 +++ include/net/netfilter/nf_queue.h | 2 ++ include/net/netfilter/nf_reject.h | 3 +++ include/net/netfilter/nf_tables_ipv6.h | 1 + include/net/netfilter/nft_fib.h | 2 ++ include/net/netfilter/nft_meta.h | 2 ++ include/net/netfilter/nft_reject.h | 5 +++++ include/uapi/linux/netfilter/xt_policy.h | 1 + 27 files changed, 80 insertions(+), 14 deletions(-)
include/linux/netfilter/ipset/ip_set_getport.h +4 -0
@@ -2,6 +2,10 @@#ifndef _IP_SET_GETPORT_H#define _IP_SET_GETPORT_H +#include <linux/skbuff.h> +#include <linux/types.h> +#include <uapi/linux/in.h> +extern bool ip_set_get_ip4_port (const struct sk_buff *skb,bool src,__be16 *port,u8 *proto);
include/linux/netfilter/nf_conntrack_amanda.h +4 -0
@@ -3,6 +3,10 @@#define _NF_CONNTRACK_AMANDA_H/* AMANDA tracking. */ +#include <linux/netfilter.h> +#include <linux/skbuff.h> +#include <net/netfilter/nf_conntrack_expect.h> + extern unsigned int (*nf_nat_amanda_hook)(struct sk_buff *skb, enum ip_conntrack_info ctinfo, unsigned int protoff,
include/linux/netfilter/nf_conntrack_ftp.h +5 -3
@@ -2,8 +2,12 @@#ifndef _NF_CONNTRACK_FTP_H#define _NF_CONNTRACK_FTP_H +#include <linux/netfilter.h> +#include <linux/skbuff.h> +#include <linux/types.h> +#include <net/netfilter/nf_conntrack_expect.h> #include <uapi/linux/netfilter/nf_conntrack_ftp.h> - +#include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> #define FTP_PORT 21
@@ -20,8 +24,6 @@ struct nf_ct_ftp_master {u_int16_t flags[IP_CT_DIR_MAX ]; }; -struct nf_conntrack_expect ; -/* For NAT to hook in when we find a packet which describes what other * connection we should expect. */ extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff *skb,
include/linux/netfilter/nf_conntrack_h323.h +5 -2
@@ -4,7 +4,12 @@#ifdef __KERNEL__ +#include <linux/netfilter.h> +#include <linux/skbuff.h> +#include <linux/types.h> #include <linux/netfilter/nf_conntrack_h323_asn1.h> +#include <net/netfilter/nf_conntrack_expect.h> +#include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> #define RAS_PORT 1719#define Q931_PORT 1720
@@ -28,8 +33,6 @@ struct nf_ct_h323_master { }; }; -struct nf_conn ; -int get_h225_addr (struct nf_conn *ct,unsigned char *data,TransportAddress *taddr,union nf_inet_addr *addr,__be16 *port);
include/linux/netfilter/nf_conntrack_h323_asn1.h +2 -0
@@ -37,6 +37,8 @@/***************************************************************************** * H.323 Types ****************************************************************************/ + +#include <linux/types.h> #include <linux/netfilter/nf_conntrack_h323_types.h> typedef struct {
include/linux/netfilter/nf_conntrack_irc.h +4 -0
@@ -4,6 +4,10 @@#ifdef __KERNEL__ +#include <linux/netfilter.h> +#include <linux/skbuff.h> +#include <net/netfilter/nf_conntrack_expect.h> +#define IRC_PORT 6667 extern unsigned int (*nf_nat_irc_hook)(struct sk_buff *skb,
include/linux/netfilter/nf_conntrack_pptp.h +5 -4
@@ -3,7 +3,12 @@#ifndef _NF_CONNTRACK_PPTP_H#define _NF_CONNTRACK_PPTP_H +#include <linux/netfilter.h> +#include <linux/skbuff.h> +#include <linux/types.h> #include <linux/netfilter/nf_conntrack_common.h> +#include <net/netfilter/nf_conntrack_expect.h> +#include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> extern const char *const pptp_msg_name[];
@@ -297,10 +302,6 @@ union pptp_ctrl_union {struct PptpSetLinkInfo setlink; }; -/* crap needed for nf_conntrack_compat.h */ -struct nf_conn ; -struct nf_conntrack_expect ; - extern int (*nf_nat_pptp_hook_outbound)(struct sk_buff *skb, struct nf_conn *ct, enum ip_conntrack_info ctinfo,
include/linux/netfilter/nf_conntrack_sip.h +2 -2
@@ -3,9 +3,9 @@#define __NF_CONNTRACK_SIP_H__#ifdef __KERNEL__ -#include <net/netfilter/nf_conntrack_expect.h> - +#include <linux/skbuff.h> #include <linux/types.h> +#include <net/netfilter/nf_conntrack_expect.h> #define SIP_PORT 5060#define SIP_TIMEOUT 3600
include/linux/netfilter/nf_conntrack_snmp.h +3 -0
@@ -2,6 +2,9 @@#ifndef _NF_CONNTRACK_SNMP_H#define _NF_CONNTRACK_SNMP_H +#include <linux/netfilter.h> +#include <linux/skbuff.h> + extern int (*nf_nat_snmp_hook)(struct sk_buff *skb, unsigned int protoff, struct nf_conn *ct,
include/linux/netfilter/nf_conntrack_tftp.h +5 -0
@@ -4,6 +4,11 @@#define TFTP_PORT 69 +#include <linux/netfilter.h> +#include <linux/skbuff.h> +#include <linux/types.h> +#include <net/netfilter/nf_conntrack_expect.h> +struct tftphdr {__be16 opcode; };
include/net/netfilter/br_netfilter.h +2 -0
@@ -2,6 +2,8 @@#ifndef _BR_NETFILTER_H_#define _BR_NETFILTER_H_ +#include <linux/netfilter.h> +#include "../../../net/bridge/br_private.h" static inline struct nf_bridge_info *nf_bridge_alloc (struct sk_buff *skb)
include/net/netfilter/ipv4/nf_dup_ipv4.h +3 -0
@@ -2,6 +2,9 @@#ifndef _NF_DUP_IPV4_H_#define _NF_DUP_IPV4_H_ +#include <linux/skbuff.h> +#include <uapi/linux/in.h> +void nf_dup_ipv4 (struct net *net,struct sk_buff *skb,unsigned int hooknum,const struct in_addr *gw,int oif);
include/net/netfilter/ipv6/nf_defrag_ipv6.h +3 -1
@@ -2,7 +2,9 @@#ifndef _NF_DEFRAG_IPV6_H#define _NF_DEFRAG_IPV6_H -struct net ; +#include <linux/skbuff.h> +#include <linux/types.h> +int nf_defrag_ipv6_enable (struct net *);int nf_ct_frag6_init (void );
include/net/netfilter/ipv6/nf_dup_ipv6.h +2 -0
@@ -2,6 +2,8 @@#ifndef _NF_DUP_IPV6_H_#define _NF_DUP_IPV6_H_ +#include <linux/skbuff.h> +void nf_dup_ipv6 (struct net *net,struct sk_buff *skb,unsigned int hooknum,const struct in6_addr *gw,int oif);
include/net/netfilter/nf_conntrack_bridge.h +4 -0
@@ -1,6 +1,10 @@ #ifndef NF_CONNTRACK_BRIDGE_ #define NF_CONNTRACK_BRIDGE_ +#include <linux/module.h> +#include <linux/types.h> +#include <uapi/linux/if_ether.h> + struct nf_ct_bridge_info { struct nf_hook_ops *ops; unsigned int ops_size;
include/net/netfilter/nf_conntrack_count.h +3 -0
@@ -2,6 +2,9 @@#define _NF_CONNTRACK_COUNT_H#include <linux/list.h> +#include <linux/spinlock.h> +#include <net/netfilter/nf_conntrack_tuple.h> +#include <net/netfilter/nf_conntrack_zones.h> struct nf_conncount_data ;
include/net/netfilter/nf_dup_netdev.h +2 -0
@@ -2,6 +2,8 @@#ifndef _NF_DUP_NETDEV_H_#define _NF_DUP_NETDEV_H_ +#include <net/netfilter/nf_tables.h> +void nf_dup_netdev_egress (const struct nft_pktinfo *pkt,int oif);void nf_fwd_netdev_egress (const struct nft_pktinfo *pkt,int oif);
include/net/netfilter/nf_flow_table.h +1 -0
@@ -6,6 +6,7 @@#include <linux/netdevice.h> #include <linux/rhashtable-types.h> #include <linux/rcupdate.h> +#include <linux/netfilter.h> #include <linux/netfilter/nf_conntrack_tuple_common.h> #include <net/dst.h>
include/net/netfilter/nf_nat_helper.h +2 -2
@@ -3,9 +3,9 @@#define _NF_NAT_HELPER_H/* NAT protocol helper routines. */ +#include <linux/skbuff.h> #include <net/netfilter/nf_conntrack.h> - -struct sk_buff ; +#include <net/netfilter/nf_conntrack_expect.h> /* These return true or false. */ bool __nf_nat_mangle_tcp_packet(struct sk_buff *skb, struct nf_conn *ct,
include/net/netfilter/nf_nat_redirect.h +3 -0
@@ -2,6 +2,9 @@#ifndef _NF_NAT_REDIRECT_H_#define _NF_NAT_REDIRECT_H_ +#include <linux/skbuff.h> +#include <uapi/linux/netfilter/nf_nat.h> + unsigned int nf_nat_redirect_ipv4(struct sk_buff *skb, const struct nf_nat_ipv4_multi_range_compat *mr,
include/net/netfilter/nf_queue.h +2 -0
@@ -5,6 +5,8 @@#include <linux/ip.h> #include <linux/ipv6.h> #include <linux/jhash.h> +#include <linux/netfilter.h> +#include <linux/skbuff.h> /* Each queued (to userspace) skbuff has one of these. */ struct nf_queue_entry {
include/net/netfilter/nf_reject.h +3 -0
@@ -2,6 +2,9 @@#ifndef _NF_REJECT_H#define _NF_REJECT_H +#include <linux/types.h> +#include <uapi/linux/in.h> +static inline bool nf_reject_verify_csum (__u8 proto) {/* Skip protocols that don't use 16-bit one's complement checksum
include/net/netfilter/nf_tables_ipv6.h +1 -0
@@ -4,6 +4,7 @@#include <linux/netfilter_ipv6/ip6_tables.h> #include <net/ipv6.h> +#include <net/netfilter/nf_tables.h> static inline void nft_set_pktinfo_ipv6 (struct nft_pktinfo *pkt,struct sk_buff *skb)
include/net/netfilter/nft_fib.h +2 -0
@@ -2,6 +2,8 @@ #ifndef _NFT_FIB_H_ #define _NFT_FIB_H_ +#include <net/netfilter/nf_tables.h> + struct nft_fib { enum nft_registers dreg:8; u8 result;
include/net/netfilter/nft_meta.h +2 -0
@@ -2,6 +2,8 @@ #ifndef _NFT_META_H_ #define _NFT_META_H_ +#include <net/netfilter/nf_tables.h> + struct nft_meta { enum nft_meta_keys key:8; union {
include/net/netfilter/nft_reject.h +5 -0
@@ -2,6 +2,11 @@ #ifndef _NFT_REJECT_H_ #define _NFT_REJECT_H_ +#include <linux/types.h> +#include <net/netlink.h> +#include <net/netfilter/nf_tables.h> +#include <uapi/linux/netfilter/nf_tables.h> + struct nft_reject { enum nft_reject_types type:8; u8 icmp_code;
include/uapi/linux/netfilter/xt_policy.h +1 -0
@@ -2,6 +2,7 @@#ifndef _XT_POLICY_H#define _XT_POLICY_H +#include <linux/netfilter.h> #include <linux/types.h> #include <linux/in.h> #include <linux/in6.h>
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 9/17 netfilter: add missing IS_ENABLED(CONFIG_BRIDGE_NETFILTER) checks to header-file.
In reply to Pablo Neira AyusoFrom: Jeremy Sowden <[email protected]>
br_netfilter.h defines inline functions that use an enum constant and struct member that are only defined if CONFIG_BRIDGE_NETFILTER is enabled. Added preprocessor checks to ensure br_netfilter.h will compile if CONFIG_BRIDGE_NETFILTER is disabled.
--- include/net/netfilter/br_netfilter.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/net/netfilter/br_netfilter.h +8 -0
@@ -8,12 +8,16 @@static inline struct nf_bridge_info *nf_bridge_alloc (struct sk_buff *skb) { +#if IS_ENABLED (CONFIG_BRIDGE_NETFILTER )struct nf_bridge_info *b =skb_ext_add (skb,SKB_EXT_BRIDGE_NF );if (b)memset (b,0 ,sizeof (*b));return b; +#else +return NULL ; +#endif }void nf_bridge_update_protocol (struct sk_buff *skb);
@@ -38,10 +42,14 @@ int br_nf_pre_routing_finish_bridge(struct net *net, struct sock *sk, struct sk_static inline struct rtable *bridge_parent_rtable (const struct net_device *dev) { +#if IS_ENABLED (CONFIG_BRIDGE_NETFILTER )struct net_bridge_port *port; port =br_port_get_rcu (dev);return port ? &port->br->fake_rtable :NULL ; +#else +return NULL ; +#endif } struct net_device *setup_pre_routing(struct sk_buff *skb,
Signature · 1 line
2.11.0
Quoted 23 lines · Pablo Neira Ayuso
Hi,
The following patchset contains Netfilter/IPVS updates for net-next:
1) Rename mss field to
mss_optionfield in synproxy, from Fernando Mancera.2) Use SYSCTL_{ZERO,ONE} definitions in conntrack, from Matteo Croce.
3) More strict validation of IPVS sysctl values, from Junwei Hu.
4) Remove unnecessary spaces after on the right hand side of assignments, from yangxingwu.
5) Add offload support for bitwise operation.
6) Extend the
nft_offload_regstructure to store immediate date.7) Collapse several
ip_setheader files intoip_set.h, from Jeremy Sowden.8) Make netfilter headers compile with
CONFIG_KERNEL_HEADER_TEST=y, from Jeremy Sowden.
Quoted 6 lines
9) Fix several sparse warnings due to missing prototypes, from Valdis Kletnieks.
10) Use static lock initialiser to ensure connlabel spinlock is initialized on boot time to fix
sched/act_ct.c, patch from Florian Westphal.
Pulled, thanks.