From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 28 Jul 2017 23:43:01 +0000 (-0400)
Subject: Merge pull request #980 in SNORT/snort3 from icmp_flowkey_fix to master
X-Git-Tag: 3.0.0-240~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52bca76912f24efecb5063fe74f471902774e944;p=thirdparty%2Fsnort3.git

Merge pull request #980 in SNORT/snort3 from icmp_flowkey_fix to master

Squashed commit of the following:

commit 4c5be44956af918f64b08681bce4ae5f68199205
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Fri Jul 28 12:41:20 2017 -0400

    Fixed valgaind error on ICMP session flow key
---

diff --git a/src/stream/icmp/icmp_session.cc b/src/stream/icmp/icmp_session.cc
index ee3633b8d..b9853696c 100644
--- a/src/stream/icmp/icmp_session.cc
+++ b/src/stream/icmp/icmp_session.cc
@@ -80,6 +80,8 @@ static int ProcessIcmpUnreach(Packet* p)
 
     skey.pkt_type = p->type();
     skey.version = src->is_ip4() ? 4 : 6;
+    skey.ip_protocol = (uint8_t)p->get_ip_proto_next();
+    skey.padding = 0;
 
     if (p->proto_bits & PROTO_BIT__TCP_EMBED_ICMP)
     {