NSH: Fix NSH-related length macros that cause stack overflow

In the filed of ver_flags_ttl_len of struct nshhdr, there are only 6
bits that are used to indicate header's total length in 4-byte words.
Therefore, the max value for total is 252 (63x4), instead of 256 used
in present code base. This patch fixes it.

Reported-at: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10855
Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/datapath/linux/compat/include/net/nsh.h b/datapath/linux/compat/include/net/nsh.h
index ff3733d9032d1fa35955d16b153f9e47f7586a28..76894910cfcb06a6d1e4b0b9d90c50d875153e13 100644 (file)
--- a/datapath/linux/compat/include/net/nsh.h
+++ b/datapath/linux/compat/include/net/nsh.h
@@ -247,10 +247,10 @@ struct nshhdr {
 #define NSH_M_TYPE1_LEN   24
 
 /* NSH header maximum Length. */
-#define NSH_HDR_MAX_LEN 256
+#define NSH_HDR_MAX_LEN 252
 
 /* NSH context headers maximum Length. */
-#define NSH_CTX_HDRS_MAX_LEN 248
+#define NSH_CTX_HDRS_MAX_LEN 244
 
 static inline struct nshhdr *nsh_hdr(struct sk_buff *skb)
 {

diff --git a/include/openvswitch/nsh.h b/include/openvswitch/nsh.h
index 55f59d636e5acb6e3380698f8bfdcae58d3bf160..afed932fcb752fb3facbd3f6a01806495cfcb352 100644 (file)
--- a/include/openvswitch/nsh.h
+++ b/include/openvswitch/nsh.h
@@ -263,10 +263,10 @@ struct nsh_hdr {
 #define NSH_M_TYPE1_LEN   24
 
 /* NSH header maximum Length. */
-#define NSH_HDR_MAX_LEN 256
+#define NSH_HDR_MAX_LEN 252
 
 /* NSH context headers maximum Length. */
-#define NSH_CTX_HDRS_MAX_LEN 248
+#define NSH_CTX_HDRS_MAX_LEN 244
 
 static inline uint16_t
 nsh_hdr_len(const struct nsh_hdr *nsh)