diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-11 13:42:50 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-11 13:42:50 -0500 |
| commit | 4d73eaee24ff0cc2736c304927c1425d2541d6ab (patch) | |
| tree | 28fa7db49fc8e1f5b1727808e4ce836f6ab04af3 /net/tipc | |
| parent | 31b58ad0c3279817cd246eab27eaf53b626dfcde (diff) | |
| parent | 8303b7e8f018724a2cd7752eb29c2801fa8c4067 (diff) | |
Merge git://git.kernel.org/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>
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions