From: Brian Morris (bmorris2) <bmorris2@cisco.com>
Date: Wed, 11 Aug 2021 18:14:37 +0000 (+0000)
Subject: Merge pull request #3017 in SNORT/snort3 from ~RAMANKS/snort3:geneve to master
X-Git-Tag: 3.1.11.0~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5706f337e751ef76dcb6cb4c7b1883639003f06c;p=thirdparty%2Fsnort3.git

Merge pull request #3017 in SNORT/snort3 from ~RAMANKS/snort3:geneve to master

Squashed commit of the following:

commit 1bfa47cf887b1f72dd2a324f05a325520793600d
Author: Raman Krishnan <ramanks@cisco.com>
Date:   Tue Aug 10 20:00:45 2021 -0700

    codec: geneve: fix incorrect parsing of option header length
---

diff --git a/src/codecs/misc/cd_geneve.cc b/src/codecs/misc/cd_geneve.cc
index 00db4e67d..726c3c852 100644
--- a/src/codecs/misc/cd_geneve.cc
+++ b/src/codecs/misc/cd_geneve.cc
@@ -59,10 +59,10 @@ struct GeneveOpt
     { return (g_type); }
 
     uint8_t olen() const
-    { return (sizeof(GeneveOpt) + (g_len * 4)); }
+    { return (sizeof(GeneveOpt) + ((g_len & 0x1f) * 4)); }
 
     uint8_t len() const
-    { return (g_len * 4); }
+    { return ((g_len & 0x1f) * 4); }
 };
 
 static const RuleMap geneve_rules[] =