Florian Westphal e59ea3df3f netfilter: xt_connlimit: honor conntrack zone if available ...

Currently all the conntrack lookups are done using default zone.
In case the skb has a ct attached (e.g. template) we should use this zone
for lookups instead.  This makes connlimit work with connections assigned
to other zones.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2014-11-17 12:44:20 +01:00

..

ipset

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-10-08 21:40:54 -04:00

ipvs

ipvs: remove unnecessary assignment in __ip_vs_get_out_rt

2014-10-28 09:50:06 +09:00

core.c

netfilter: fix various sparse warnings

2014-11-13 12:14:42 +01:00

Kconfig

netfilter: fix unmet dependencies in NETFILTER_XT_TARGET_REDIRECT

2014-11-12 11:54:12 +01:00

Makefile

netfilter: nf_tables: add new expression nft_redir

2014-10-27 22:49:39 +01:00

nf_conntrack_acct.c

netfilter: introduce nf_conn_acct structure

2013-11-03 21:48:49 +01:00

nf_conntrack_amanda.c

netfilter: add my copyright statements

2013-04-18 20:27:55 +02:00

nf_conntrack_broadcast.c

…

nf_conntrack_core.c

net: use reciprocal_scale() helper

2014-08-23 12:21:21 -07: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: conntrack: seperate expect locking from nf_conntrack_lock

2014-03-07 11:41:01 +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

netfilter: add my copyright statements

2013-04-18 20:27:55 +02:00

nf_conntrack_l3proto_generic.c

…

nf_conntrack_labels.c

netfilter: connlabels: remove unneeded includes

2013-07-31 16:39:18 +02:00

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

netfilter: nf_conntrack: flush net_gre->keymap_list only from gre helper

2014-04-08 10:56:12 +02:00

nf_conntrack_proto_dccp.c

netfilter: nf_conntrack_dccp: fix skb_header_pointer API usages

2014-01-06 17:40:02 +01:00

nf_conntrack_proto_generic.c

netfilter: conntrack: disable generic tracking for known protocols

2014-09-29 12:17:49 +02:00

nf_conntrack_proto_gre.c

netfilter: nf_conntrack: flush net_gre->keymap_list only from gre helper

2014-04-08 10:56:12 +02:00

nf_conntrack_proto_sctp.c

netfilter: add my copyright statements

2013-04-18 20:27:55 +02:00

nf_conntrack_proto_tcp.c

netfilter: add SYNPROXY core/target

2013-08-28 00:27:54 +02:00

nf_conntrack_proto_udp.c

netfilter: add my copyright statements

2013-04-18 20:27:55 +02:00

nf_conntrack_proto_udplite.c

netfilter: nf_log: prepare net namespace support for loggers

2013-04-05 20:12:54 +02:00

nf_conntrack_proto.c

netfilter: nf_conntrack: remove dead code

2014-01-03 23:41:37 +01:00

nf_conntrack_sane.c

netfilter: nf_ct_helper: better logging for dropped packets

2013-02-19 02:48:05 +01:00

nf_conntrack_seqadj.c

netfilter: only warn once on wrong seqadj usage

2014-01-06 14:23:17 +01:00

nf_conntrack_sip.c

netfilter: replace strnicmp with strncasecmp

2014-10-14 02:18:24 +02:00

nf_conntrack_snmp.c

netfilter: nf_ct_snmp: add include file

2013-01-18 00:28:18 +01:00

nf_conntrack_standalone.c

net: use ktime_get_ns() and ktime_get_real_ns() helpers

2014-08-22 19:57:23 -07:00

nf_conntrack_tftp.c

netfilter: add my copyright statements

2013-04-18 20:27:55 +02:00

nf_conntrack_timeout.c

netfilter: nf_ct_timeout: move initialization out of pernet_operations

2013-01-23 12:56:02 +01:00

nf_conntrack_timestamp.c

netfilter: nf_ct_timestamp: Fix BUG_ON after netns deletion

2013-12-20 14:58:29 +01:00

nf_internals.h

net: misc: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

nf_log_common.c

netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER)

2014-10-02 18:30:54 +02:00

nf_log.c

netfilter: nf_log: fix sparse warning in nf_logger_find_get()

2014-11-04 17:56:31 +01:00

nf_nat_amanda.c

netfilter: add my copyright statements

2013-04-18 20:27:55 +02:00

nf_nat_core.c

net: use reciprocal_scale() helper

2014-08-23 12:21:21 -07:00

nf_nat_ftp.c

netfilter: nf_ct_helper: better logging for dropped packets

2013-02-19 02:48:05 +01:00

nf_nat_helper.c

netfilter: nf_conntrack: make sequence number adjustments usuable without NAT

2013-08-28 00:26:48 +02:00

nf_nat_irc.c

netfilter: nf_nat: fix access to uninitialized buffer in IRC NAT helper

2014-01-06 14:17:17 +01:00

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_sip.c

netfilter: replace strnicmp with strncasecmp

2014-10-14 02:18:24 +02:00

nf_nat_tftp.c

netfilter: nf_ct_helper: better logging for dropped packets

2013-02-19 02:48:05 +01:00

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

netfilter: nf_conntrack: don't release a conntrack with non-zero refcnt

2014-02-05 17:46:06 +01:00

nf_tables_api.c

netfilter: fix spelling errors

2014-10-30 17:35:30 +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

netfilter: nf_tables: fix error path in the init functions

2014-01-09 23:25:48 +01: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

netfilter: check return code from nla_parse_tested

2013-06-20 11:20:13 +02:00

nfnetlink_cttimeout.c

netfilter: cttimeout: allow to set/get default protocol timeouts

2013-10-01 13:17:39 +02:00

nfnetlink_log.c

netfilter: nfnetlink_log: remove unnecessary error messages

2014-11-13 13:13:00 +01:00

nfnetlink_queue_core.c

net: make skb_gso_segment error handling more robust

2014-10-20 12:38:13 -04:00

nfnetlink_queue_ct.c

netfilter: nf_conntrack: make sequence number adjustments usuable without NAT

2013-08-28 00:26:48 +02:00

nfnetlink.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-10-02 11:25:43 -07:00

nft_bitwise.c

netfilter: nf_tables: expression ops overloading

2013-10-14 17:16:08 +02:00

nft_byteorder.c

netfilter: nf_tables: expression ops overloading

2013-10-14 17:16:08 +02:00

nft_cmp.c

netfilter: nf_tables: fix nft_cmp_fast failure on big endian for size < 4

2014-04-14 10:38:02 +02:00

nft_compat.c

netfilter: nft_compat: validate chain type in match/target

2014-10-18 14:14:07 +02:00

nft_counter.c

netfilter: nf_tables: expression ops overloading

2013-10-14 17:16:08 +02:00

nft_ct.c

netfilter: nft_ct: split nft_ct_init() into two functions for get/set

2014-04-02 21:29:45 +02:00

nft_expr_template.c

netfilter: nf_tables: expression ops overloading

2013-10-14 17:16:08 +02:00

nft_exthdr.c

netfilter: nft_exthdr: call ipv6_find_hdr() with explicitly initialized offset

2013-12-20 11:25:10 +01:00

nft_hash.c

netfilter: nft_hash: no need for rcu in the hash set destroy path

2014-09-03 10:57:06 +02:00

nft_immediate.c

netfilter: nf_tables: restore context for expression destructors

2014-03-08 12:35:17 +01:00

nft_limit.c

netfilter: nf_tables: expression ops overloading

2013-10-14 17:16:08 +02:00

nft_log.c

netfilter: nft_log: fix coccinelle warnings

2014-06-29 13:55:08 +02:00

nft_lookup.c

netfilter: nf_tables: use new transaction infrastructure to handle sets

2014-05-19 12:06:10 +02:00

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: nft_nat: dump attributes if they are set

2014-10-18 14:16:13 +02:00

nft_payload.c

netfilter: nf_tables: check if payload length is a power of 2

2014-02-17 11:21:17 +01:00

nft_queue.c

netfilter: nf_tables: fix log/queue expressions for NFPROTO_INET

2014-02-06 11:41:38 +01:00

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_inet.c

netfilter: nft_reject: introduce icmp code abstraction for inet and bridge

2014-10-02 18:29:57 +02:00

nft_reject.c

netfilter: fix wrong arithmetics regarding NFT_REJECT_ICMPX_MAX

2014-10-07 20:16:31 +02:00

x_tables.c

net/netfilter/x_tables.c: use __seq_open_private()

2014-09-26 18:42:29 +02:00

xt_addrtype.c

netfilter: xt_addrtype: fix trivial typo

2013-07-31 16:36:25 +02:00

xt_AUDIT.c

netfilter: Convert uses of __constant_<foo> to <foo>

2014-03-13 14:13:19 +01:00

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_CHECKSUM.c

…

xt_CLASSIFY.c

…

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

netfilter: add connlabel conntrack extension

2013-01-18 00:28:15 +01:00

xt_connlimit.c

netfilter: xt_connlimit: honor conntrack zone if available

2014-11-17 12:44:20 +01:00

xt_connmark.c

netfilter: Fix FSF address in file headers

2013-12-06 12:37:57 -05:00

xt_CONNSECMARK.c

…

xt_conntrack.c

netfilter: add my copyright statements

2013-04-18 20:27:55 +02:00

xt_cpu.c

…

xt_CT.c

netfilter: nf_conntrack: don't release a conntrack with non-zero refcnt

2014-02-05 17:46:06 +01:00

xt_dccp.c

…

xt_devgroup.c

…

xt_dscp.c

…

xt_DSCP.c

netfilter: fix various sparse warnings

2014-11-13 12:14:42 +01:00

xt_ecn.c

…

xt_esp.c

…

xt_hashlimit.c

netfilter: Convert pr_warning to pr_warn

2014-09-10 12:40:10 -07:00

xt_helper.c

…

xt_hl.c

…

xt_HL.c

…

xt_HMARK.c

net: use reciprocal_scale() helper

2014-08-23 12:21:21 -07:00

xt_IDLETIMER.c

…

xt_ipcomp.c

netfilter: xt_ipcomp: Use ntohs to ease sparse warning

2014-02-19 11:41:25 +01:00

xt_iprange.c

…

xt_ipvs.c

…

xt_l2tp.c

netfilter: introduce l2tp match extension

2014-01-09 21:36:39 +01:00

xt_LED.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-08-05 18:46:26 -07:00

xt_length.c

…

xt_limit.c

netfilter: add my copyright statements

2013-04-18 20:27:55 +02:00

xt_LOG.c

netfilter: xt_LOG: add missing string format in nf_log_packet()

2014-06-28 18:50:35 +02:00

xt_mac.c

…

xt_mark.c

…

xt_multiport.c

…

xt_nat.c

netfilter: xt_nat: fix incorrect hooks for SNAT and DNAT targets

2012-10-15 13:39:12 +02:00

xt_NETMAP.c

…

xt_nfacct.c

netfilter: nfnetlink_acct: Adding quota support to accounting framework

2014-04-29 18:25:14 +02:00

xt_NFLOG.c

netfilter: log: netns NULL ptr bug when calling from conntrack

2013-05-15 14:11:07 +02:00

xt_NFQUEUE.c

netfilter: xt_NFQUEUE: separate reusable code

2013-12-07 23:20:45 +01:00

xt_osf.c

netfilter: Add {ipt,ip6t}_osf aliases for xt_osf

2014-04-03 23:52:22 +02:00

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

net_sched: add 64bit rate estimators

2013-06-11 02:51:03 -07:00

xt_RATEEST.c

net: sched: make bstats per cpu and estimator RCU safe

2014-09-30 01:02:26 -04:00

xt_realm.c

…

xt_recent.c

net: use the new API kvfree()

2014-06-05 00:49:51 -07:00

xt_REDIRECT.c

netfilter: refactor NAT redirect IPv6 code to use it from nf_tables

2014-10-27 22:48:10 +01:00

xt_repldata.h

net: netfilter: LLVMLinux: vlais-netfilter

2014-06-07 11:44:39 -07:00

xt_sctp.c

…

xt_SECMARK.c

…

xt_set.c

netfilter: ipset: Add skbinfo extension support to SET target.

2014-09-15 22:20:21 +02:00

xt_socket.c

netfilter: xt_socket: use sock_gen_put()

2013-10-17 10:27:25 +02:00

xt_state.c

…

xt_statistic.c

net: replace macros net_random and net_srandom with direct calls to prandom

2014-01-14 15:15:25 -08:00

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_TCPMSS.c

netfilter: xt_TCPMSS: lookup route from proper net namespace

2013-09-27 16:18:23 +02:00

xt_TCPOPTSTRIP.c

netfilter: xt_TCPOPTSTRIP: fix possible off by one access

2013-08-01 11:45:15 +02:00

xt_tcpudp.c

…

xt_TEE.c

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

xt_time.c

…

xt_TPROXY.c

ipv6: make lookups simpler and faster

2013-10-09 00:01:25 -04:00

xt_TRACE.c

…

xt_u32.c

…