Merge branch 'master' of git://1984.lsi.us.es/nf

Browse source

Pablo Neira Ayuso says:

====================
The following patchset contains three Netfilter fixes, they are:

* Fix conntrack helper re-assignment after NAT mangling if only if
  the same helper is attached to the conntrack again, from Florian
  Westphal.

* Don't allow the creation of conntrack entries via ctnetlink if the
  original and reply tuples are missing, from Florian Westphal.

* Fix broken sysctl interface in nf_ct_reasm while adding netns support
  to it, from Michal Kubecek.
====================

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

...

This commit is contained in:

David S. Miller 2013-02-14 13:16:04 -05:00

parent f350ca0370 894e2ac82b

commit 306dbf9e55

3 changed files with 9 additions and 4 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/ipv6/netfilter/nf_conntrack_reasm.c

View file

4

net/netfilter/nf_conntrack_helper.c

View file

3

net/netfilter/nf_conntrack_netlink.c

View file