David S. Miller 2bd8221804 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ... Pablo Neira Ayuso says: ==================== netfilter/ipvs fixes for net The following patchset contains netfilter/ipvs fixes, they are: 1) Small fix for the FTP helper in IPVS, a diff variable may be left unset when CONFIG_IP_VS_IPV6 is set. Patch from Dan Carpenter. 2) Fix nf_tables port NAT in little endian archs, patch from leroy christophe. 3) Fix race condition between conntrack confirmation and flush from userspace. This is the second reincarnation to resolve this problem. 4) Make sure inner messages in the batch come with the nfnetlink header. 5) Relax strict check from nfnetlink_bind() that may break old userspace applications using all 1s group mask. 6) Schedule removal of chains once no sets and rules refer to them in the new nf_tables ruleset flush command. Reported by Asbjoern Sloth Toennesen. Note that this batch comes later than usual because of the short winter holidays. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-12 00:14:49 -05:00
..
ipset	netfilter: ipset: Explicitly add padding elements to hash:net, net and hash:net, port, net	2014-12-03 12:43:36 +01:00
ipvs	ipvs: uninitialized data with IP_VS_IPV6	2014-12-10 17:36:47 +09:00
Kconfig	netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module	2014-11-27 13:08:42 +01:00
Makefile	netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module	2014-11-27 13:08:42 +01:00
core.c	netfilter: fix various sparse warnings	2014-11-13 12:14:42 +01:00
nf_conntrack_acct.c	…
nf_conntrack_amanda.c	…
nf_conntrack_broadcast.c	…
nf_conntrack_core.c	netfilter: conntrack: fix race between confirmation and flush	2015-01-06 22:27:45 +01:00
nf_conntrack_ecache.c	netfilter: conntrack: remove timer from ecache extension	2014-06-25 19:15:38 +02:00
nf_conntrack_expect.c	net: use reciprocal_scale() helper	2014-08-23 12:21:21 -07:00
nf_conntrack_extend.c	…
nf_conntrack_ftp.c	netfilter: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
nf_conntrack_h323_asn1.c	…
nf_conntrack_h323_main.c	netfilter: nf_conntrack_h323: lookup route from proper net namespace	2014-11-17 12:47:14 +01:00
nf_conntrack_h323_types.c	…
nf_conntrack_helper.c	netfilter: fix spelling errors	2014-10-30 17:35:30 +01:00
nf_conntrack_irc.c	…
nf_conntrack_l3proto_generic.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_labels.c	…
nf_conntrack_netbios_ns.c	…
nf_conntrack_netlink.c	net: use ktime_get_ns() and ktime_get_real_ns() helpers	2014-08-22 19:57:23 -07:00
nf_conntrack_pptp.c	…
nf_conntrack_proto.c	…
nf_conntrack_proto_dccp.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_generic.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_gre.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_sctp.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_tcp.c	Merge branch 'iov_iter' into for-next	2014-12-08 20:39:29 -05:00
nf_conntrack_proto_udp.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_udplite.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_sane.c	…
nf_conntrack_seqadj.c	…
nf_conntrack_sip.c	netfilter: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
nf_conntrack_snmp.c	…
nf_conntrack_standalone.c	netfilter: Remove checks of seq_printf() return values	2014-11-05 14:11:02 -05:00
nf_conntrack_tftp.c	…
nf_conntrack_timeout.c	…
nf_conntrack_timestamp.c	…
nf_internals.h	…
nf_log.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-12-11 14:27:06 -08:00
nf_log_common.c	netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER)	2014-10-02 18:30:54 +02:00
nf_nat_amanda.c	…
nf_nat_core.c	net: use reciprocal_scale() helper	2014-08-23 12:21:21 -07:00
nf_nat_ftp.c	…
nf_nat_helper.c	…
nf_nat_irc.c	…
nf_nat_proto_common.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_dccp.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_sctp.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_tcp.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_udp.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_udplite.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_unknown.c	…
nf_nat_redirect.c	netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module	2014-11-27 13:08:42 +01:00
nf_nat_sip.c	netfilter: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
nf_nat_tftp.c	…
nf_queue.c	netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER)	2014-10-02 18:30:54 +02:00
nf_sockopt.c	netfilter: don't use mutex_lock_interruptible()	2014-08-08 16:47:23 +02:00
nf_synproxy_core.c	…
nf_tables_api.c	netfilter: nf_tables: fix flush ruleset chain dependencies	2015-01-06 22:27:48 +01:00
nf_tables_core.c	netfilter: nf_tables: 64bit stats need some extra synchronization	2014-07-14 12:00:17 +02:00
nf_tables_inet.c	…
nfnetlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2015-01-12 00:14:49 -05:00
nfnetlink_acct.c	netfilter: nfnetlink_acct: add filter support to nfacct counter list/reset	2014-08-26 21:36:19 +02:00
nfnetlink_cthelper.c	…
nfnetlink_cttimeout.c	…
nfnetlink_log.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2014-11-24 16:00:58 -05:00
nfnetlink_queue_core.c	Merge branch 'iov_iter' into for-next	2014-12-08 20:39:29 -05:00
nfnetlink_queue_ct.c	…
nft_bitwise.c	…
nft_byteorder.c	…
nft_cmp.c	…
nft_compat.c	netfilter: nft_compat: use the match->table to validate dependencies	2014-11-12 12:06:24 +01:00
nft_counter.c	…
nft_ct.c	…
nft_expr_template.c	…
nft_exthdr.c	…
nft_hash.c	rhashtable: Drop gfp_flags arg in insert/remove functions	2014-11-13 15:18:40 -05:00
nft_immediate.c	…
nft_limit.c	…
nft_log.c	netfilter: nft_log: fix coccinelle warnings	2014-06-29 13:55:08 +02:00
nft_lookup.c	…
nft_masq.c	netfilter: nf_tables: restrict nat/masq expressions to nat chain type	2014-10-13 20:42:00 +02:00
nft_meta.c	netfilter: nft_meta: add cgroup support	2014-11-09 16:21:22 +01:00
nft_nat.c	netfilter: nf_tables: fix port natting in little endian archs	2014-12-23 15:34:28 +01:00
nft_payload.c	…
nft_queue.c	…
nft_rbtree.c	netfilter: nft_rbtree: no need for spinlock from set destroy path	2014-09-03 10:57:08 +02:00
nft_redir.c	netfilter: nft_redir: fix sparse warnings	2014-11-12 12:00:04 +01:00
nft_reject.c	netfilter: fix wrong arithmetics regarding NFT_REJECT_ICMPX_MAX	2014-10-07 20:16:31 +02:00
nft_reject_inet.c	netfilter: nft_reject: introduce icmp code abstraction for inet and bridge	2014-10-02 18:29:57 +02:00
x_tables.c	netfilter: Remove checks of seq_printf() return values	2014-11-05 14:11:02 -05:00
xt_AUDIT.c	…
xt_CHECKSUM.c	…
xt_CLASSIFY.c	…
xt_CONNSECMARK.c	…
xt_CT.c	…
xt_DSCP.c	netfilter: fix various sparse warnings	2014-11-13 12:14:42 +01:00
xt_HL.c	…
xt_HMARK.c	net: use reciprocal_scale() helper	2014-08-23 12:21:21 -07:00
xt_IDLETIMER.c	…
xt_LED.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-08-05 18:46:26 -07:00
xt_LOG.c	netfilter: xt_LOG: add missing string format in nf_log_packet()	2014-06-28 18:50:35 +02:00
xt_NETMAP.c	…
xt_NFLOG.c	…
xt_NFQUEUE.c	…
xt_RATEEST.c	net: sched: make bstats per cpu and estimator RCU safe	2014-09-30 01:02:26 -04:00
xt_REDIRECT.c	netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module	2014-11-27 13:08:42 +01:00
xt_SECMARK.c	…
xt_TCPMSS.c	…
xt_TCPOPTSTRIP.c	…
xt_TEE.c	…
xt_TPROXY.c	…
xt_TRACE.c	…
xt_addrtype.c	…
xt_bpf.c	net: filter: split 'struct sk_filter' into socket and bpf parts	2014-08-02 15:03:58 -07:00
xt_cgroup.c	netfilter: x_tables: allow to use default cgroup match	2014-08-19 21:38:55 +02:00
xt_cluster.c	net: use reciprocal_scale() helper	2014-08-23 12:21:21 -07:00
xt_comment.c	…
xt_connbytes.c	netfilter: Convert pr_warning to pr_warn	2014-09-10 12:40:10 -07:00
xt_connlabel.c	…
xt_connlimit.c	netfilter: xt_connlimit: honor conntrack zone if available	2014-11-17 12:44:20 +01:00
xt_connmark.c	…
xt_conntrack.c	…
xt_cpu.c	…
xt_dccp.c	…
xt_devgroup.c	…
xt_dscp.c	…
xt_ecn.c	…
xt_esp.c	…
xt_hashlimit.c	netfilter: Remove checks of seq_printf() return values	2014-11-05 14:11:02 -05:00
xt_helper.c	…
xt_hl.c	…
xt_ipcomp.c	…
xt_iprange.c	…
xt_ipvs.c	…
xt_l2tp.c	…
xt_length.c	…
xt_limit.c	…
xt_mac.c	…
xt_mark.c	…
xt_multiport.c	…
xt_nat.c	…
xt_nfacct.c	…
xt_osf.c	…
xt_owner.c	…
xt_physdev.c	netfilter: explicit module dependency between br_netfilter and physdev	2014-10-02 18:30:57 +02:00
xt_pkttype.c	…
xt_policy.c	…
xt_quota.c	…
xt_rateest.c	…
xt_realm.c	…
xt_recent.c	netfilter: xt_recent: relax ip_pkt_list_tot restrictions	2014-11-27 12:40:31 +01:00
xt_repldata.h	net: netfilter: LLVMLinux: vlais-netfilter	2014-06-07 11:44:39 -07:00
xt_sctp.c	…
xt_set.c	netfilter: ipset: Alignment problem between 64bit kernel 32bit userspace	2014-12-03 12:43:35 +01:00
xt_socket.c	…
xt_state.c	…
xt_statistic.c	…
xt_string.c	netfilter: xt_string: Remove unnecessary initialization of struct ts_state	2014-09-09 16:31:25 +02:00
xt_tcpmss.c	…
xt_tcpudp.c	…
xt_time.c	…
xt_u32.c	…