Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Browse source

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for your net tree. More
specifically, they are:

1) Fix missing filter table per-netns registration in arptables, from
   Florian Westphal.

2) Resolve out of bound access when parsing TCP options in
   nf_conntrack_tcp, patch from Jozsef Kadlecsik.

3) Prefer NFPROTO_BRIDGE extensions over NFPROTO_UNSPEC in ebtables,
   this resolves conflict between xt_limit and ebt_limit, from Phil Sutter.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2016-04-13 21:49:03 -04:00

parent 4bc0eb3a1b bcf4934288

commit 60e19518d6

3 changed files with 15 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

net/bridge/netfilter/ebtables.c

View file

6

net/ipv4/netfilter/arptable_filter.c

View file

4

net/netfilter/nf_conntrack_proto_tcp.c

View file