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 net:

1) Out-of-bound access to packet data from the snmp nat helper,
   from Jann Horn.

2) ICMP(v6) error packets are set as related traffic by conntrack,
   update protocol number before calling nf_nat_ipv4_manip_pkt()
   to use ICMP(v6) rather than the original protocol number,
   from Florian Westphal.
====================

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

...

This commit is contained in:

David S. Miller 2019-02-11 10:42:50 -08:00

parent 31b58ad0c3 8303b7e8f0

commit 4d73eaee24

3 changed files with 8 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

1

net/ipv4/netfilter/nf_nat_l3proto_ipv4.c

View file

7

net/ipv4/netfilter/nf_nat_snmp_basic_main.c

View file

1

net/ipv6/netfilter/nf_nat_l3proto_ipv6.c

View file