diff options
author | David S. Miller <davem@davemloft.net> | 2016-06-01 17:54:19 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-01 17:54:19 -0700 |
commit | fc14963f249f9aca1ac84c9c8659b4f35e0a315e (patch) | |
tree | 9d03a9214de66a76960b57bbe1cc54d35a99f986 /net/netfilter/nf_conntrack_standalone.c | |
parent | 31843af4dc6acb71c4bd287afe7921c81b0b6fcb (diff) | |
parent | 893e093c786c4256d52809eed697e9d70a6f6643 (diff) | |
download | linux-stable-fc14963f249f9aca1ac84c9c8659b4f35e0a315e.tar.gz linux-stable-fc14963f249f9aca1ac84c9c8659b4f35e0a315e.tar.bz2 linux-stable-fc14963f249f9aca1ac84c9c8659b4f35e0a315e.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for your net tree,
they are:
1) Fix incorrect timestamp in nfnetlink_queue introduced when addressing
y2038 safe timestamp, from Florian Westphal.
2) Get rid of leftover conntrack definition from the previous merge
window, oneliner from Florian.
3) Make nf_queue handler pernet to resolve race on dereferencing the
hook state structure with netns removal, from Eric Biederman.
4) Ensure clean exit on unregistered helper ports, from Taehee Yoo.
5) Restore FLOWI_FLAG_KNOWN_NH in nf_dup_ipv6. This got lost while
generalizing xt_TEE to add packet duplication support in nf_tables,
from Paolo Abeni.
6) Insufficient netlink NFTA_SET_TABLE attribute check in
nf_tables_getset(), from Phil Turnbull.
7) Reject helper registration on duplicated ports via modparams.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_standalone.c')
-rw-r--r-- | net/netfilter/nf_conntrack_standalone.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index f87e84ebcec3..c026c472ea80 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -487,8 +487,6 @@ static struct ctl_table nf_ct_sysctl_table[] = { { } }; -#define NET_NF_CONNTRACK_MAX 2089 - static struct ctl_table nf_ct_netfilter_table[] = { { .procname = "nf_conntrack_max", |