From: David S. Miller <davem@davemloft.net>
Date: Mon, 11 Feb 2019 18:42:50 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4d73eaee24ff0cc2736c304927c1425d2541d6ab;p=linux.git

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

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

4d73eaee24ff0cc2736c304927c1425d2541d6ab