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 00db4e67da8005d7e93fd421a00015341752f5e0..726c3c8526ace0c32d17ac646c56622ea108739b 100644 (file)
--- 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[] =