Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter/IPVS updates for net-next
The following patchset contains Netfilter/IPVS updates for net-next,
they are:
1) Count pre-established connections as active in "least connection"
schedulers such that pre-established connections to avoid overloading
backend servers on peak demands, from Michal Kubecek via Simon Horman.
2) Address a race condition when resizing the conntrack table by caching
the bucket size when fulling iterating over the hashtable in these
three possible scenarios: 1) dump via /proc/net/nf_conntrack,
2) unlinking userspace helper and 3) unlinking custom conntrack timeout.
From Liping Zhang.
3) Revisit early_drop() path to perform lockless traversal on conntrack
eviction under stress, use del_timer() as synchronization point to
avoid two CPUs evicting the same entry, from Florian Westphal.
4) Move NAT hlist_head to nf_conn object, this simplifies the existing
NAT extension and it doesn't increase size since recent patches to
align nf_conn, from Florian.
5) Use rhashtable for the by-source NAT hashtable, also from Florian.
6) Don't allow --physdev-is-out from OUTPUT chain, just like
--physdev-out is not either, from Hangbin Liu.
7) Automagically set on nf_conntrack counters if the user tries to
match ct bytes/packets from nftables, from Liping Zhang.
8) Remove possible_net_t fields in nf_tables set objects since we just
simply pass the net pointer to the backend set type implementations.
9) Fix possible off-by-one in h323, from Toby DiPasquale.
10) early_drop() may be called from ctnetlink patch, so we must hold
rcu read size lock from them too, this amends Florian's patch #3
coming in this batch, from Liping Zhang.
11) Use binary search to validate jump offset in x_tables, this
addresses the O(n!) validation that was introduced recently
resolve security issues with unpriviledge namespaces, from Florian.
12) Fix reference leak to connlabel in error path of nft_ct, from Zhang.
13) Three updates for nft_log: Fix log prefix leak in error path. Bail
out on loglevel larger than debug in nft_log and set on the new
NF_LOG_F_COPY_LEN flag when snaplen is specified. Again from Zhang.
14) Allow to filter rule dumps in nf_tables based on table and chain
names.
15) Simplify connlabel to always use 128 bits to store labels and
get rid of unused function in xt_connlabel, from Florian.
16) Replace set_expect_timeout() by mod_timer() from the h323 conntrack
helper, by Gao Feng.
17) Put back x_tables module reference in nft_compat on error, from
Liping Zhang.
18) Add a reference count to the x_tables extensions cache in
nft_compat, so we can remove them when unused and avoid a crash
if the extensions are rmmod, again from Zhang.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/linux/netfilter/x_tables.h 4 additions, 0 deletionsinclude/linux/netfilter/x_tables.h
- include/net/netfilter/nf_conntrack.h 7 additions, 2 deletionsinclude/net/netfilter/nf_conntrack.h
- include/net/netfilter/nf_conntrack_core.h 2 additions, 0 deletionsinclude/net/netfilter/nf_conntrack_core.h
- include/net/netfilter/nf_conntrack_extend.h 0 additions, 3 deletionsinclude/net/netfilter/nf_conntrack_extend.h
- include/net/netfilter/nf_conntrack_helper.h 15 additions, 0 deletionsinclude/net/netfilter/nf_conntrack_helper.h
- include/net/netfilter/nf_conntrack_labels.h 4 additions, 14 deletionsinclude/net/netfilter/nf_conntrack_labels.h
- include/net/netfilter/nf_nat.h 1 addition, 2 deletionsinclude/net/netfilter/nf_nat.h
- include/net/netfilter/nf_tables.h 11 additions, 10 deletionsinclude/net/netfilter/nf_tables.h
- net/ipv4/netfilter/arp_tables.c 25 additions, 22 deletionsnet/ipv4/netfilter/arp_tables.c
- net/ipv4/netfilter/ip_tables.c 24 additions, 21 deletionsnet/ipv4/netfilter/ip_tables.c
- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c 10 additions, 4 deletionsnet/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
- net/ipv6/netfilter/ip6_tables.c 24 additions, 21 deletionsnet/ipv6/netfilter/ip6_tables.c
- net/netfilter/ipvs/ip_vs_proto_tcp.c 23 additions, 2 deletionsnet/netfilter/ipvs/ip_vs_proto_tcp.c
- net/netfilter/nf_conntrack_core.c 67 additions, 48 deletionsnet/netfilter/nf_conntrack_core.c
- net/netfilter/nf_conntrack_extend.c 2 additions, 13 deletionsnet/netfilter/nf_conntrack_extend.c
- net/netfilter/nf_conntrack_ftp.c 18 additions, 40 deletionsnet/netfilter/nf_conntrack_ftp.c
- net/netfilter/nf_conntrack_h323_asn1.c 2 additions, 1 deletionnet/netfilter/nf_conntrack_h323_asn1.c
- net/netfilter/nf_conntrack_h323_main.c 1 addition, 14 deletionsnet/netfilter/nf_conntrack_h323_main.c
- net/netfilter/nf_conntrack_helper.c 70 additions, 6 deletionsnet/netfilter/nf_conntrack_helper.c
- net/netfilter/nf_conntrack_irc.c 12 additions, 24 deletionsnet/netfilter/nf_conntrack_irc.c
Loading
Please register or sign in to comment