diff options
author | David S. Miller <davem@davemloft.net> | 2016-06-17 19:50:04 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-17 19:50:04 -0700 |
commit | 695ef16cd0510f3bc963967fd73a360989fe4ebf (patch) | |
tree | 45b37856b4c910f42b369b456a754bd3ba2cf797 /net/ipv4/arp.c | |
parent | ce449ba77a2271dce9771fb1f3eb37e4be6a8b81 (diff) | |
parent | 1463847e93fe693e89c52b03ab4ede6800d717c1 (diff) |
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 rather small patches but fixing several outstanding bugs in
nf_conntrack and nf_tables, as well as minor problems with missing
SYNPROXY header uapi installation:
1) Oneliner not to leak conntrack kmemcache on module removal, this
problem was introduced in the previous merge window, patch from
Florian Westphal.
2) Two fixes for insufficient ruleset loop validation, one due to
incorrect flag check in nf_tables_bind_set() and another related to
silly wrong generation mask logic from the walk path, from Liping
Zhang.
3) Fix double-free of anonymous sets on error, this fix simplifies the
code to let the abort path take care of releasing the set object,
also from Liping Zhang.
4) The introduction of helper function for transactions broke the skip
inactive rules logic from the nft_do_chain(), again from Liping
Zhang.
5) Two patches to install uapi xt_SYNPROXY.h header and calm down
kbuild robot due to missing #include <linux/types.h>.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/arp.c')
0 files changed, 0 insertions, 0 deletions