summaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_output.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-04-06 17:29:59 +0200
committerDavid S. Miller <davem@davemloft.net>2014-04-06 17:29:59 +0200
commitd80e773f16f66a610e04f6875d4da84e74a8fb6c (patch)
tree5734eaa39c94ee47fddd8b9077de93c5b0267d0d /net/ipv4/xfrm4_output.c
parentxen-netback: Trivial format string fix (diff)
parentnetfilter: Can't fail and free after table replacement (diff)
downloadlinux-d80e773f16f66a610e04f6875d4da84e74a8fb6c.tar.xz
linux-d80e773f16f66a610e04f6875d4da84e74a8fb6c.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter fixes for your net tree, they are: * Use 16-bits offset and length fields instead of 8-bits in the conntrack extension to avoid an overflow when many conntrack extension are used, from Andrey Vagin. * Allow to use cgroup match from LOCAL_IN, there is no apparent reason for not allowing this, from Alexey Perevalov. * Fix build of the connlimit match after recent changes to let it scale up that result in a divide by zero compilation error in UP, from Florian Westphal. * Move the lock out of the structure connlimit_data to avoid a false sharing spotted by Eric Dumazet and Jesper D. Brouer, this needed as part of the recent connlimit scalability improvements, also from Florian Westphal. * Add missing module aliases in xt_osf to fix loading of rules using this match, from Kirill Tkhai. * Restrict set names in nf_tables to 15 characters instead of silently trimming them off, from me. * Fix wrong format in nf_tables request module call for chain types, spotted by Florian Westphal, patch from me. * Fix crash in xtables when it fails to copy the counters back to userspace after having replaced the table already. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_output.c')
0 files changed, 0 insertions, 0 deletions