From: Cole Dishington <Cole.Dishington@alliedtelesis.co.nz>
Date: Mon, 10 Jul 2023 02:02:18 +0000 (+1200)
Subject: decode-ipv6: Set L4 proto on ipv6 incase of GRE decode error
X-Git-Tag: suricata-6.0.14~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=970d81ba9166677cd9f43e571f9f5931567522b1;p=thirdparty%2Fsuricata.git

decode-ipv6: Set L4 proto on ipv6 incase of GRE decode error

Set the L4 proto before decoding GRE in ipv6 decoding in case there is a
GRE header decoding error.

Bug: #6222
(cherry picked from commit 1b08c561f6f8f5ae3a1f29b68638f9884673fe58)
---

diff --git a/src/decode-ipv6.c b/src/decode-ipv6.c
index bceb28ea07..f1defbf42a 100644
--- a/src/decode-ipv6.c
+++ b/src/decode-ipv6.c
@@ -636,6 +636,7 @@ int DecodeIPV6(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, const uint8_t *
             DecodeIP6inIP6(tv, dtv, p, pkt + IPV6_HEADER_LEN, IPV6_GET_PLEN(p));
             return TM_ECODE_OK;
         case IPPROTO_GRE:
+            IPV6_SET_L4PROTO(p, IPPROTO_GRE);
             DecodeGRE(tv, dtv, p, pkt + IPV6_HEADER_LEN, IPV6_GET_PLEN(p));
             break;
         case IPPROTO_FRAGMENT: