From 9b27984d0e2da430b78a975e59f55c96de5f6056 Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Sat, 2 Nov 2024 13:20:26 -0700
Subject: [PATCH] NNI_GETXX macros are brittle due to casting mistake.

Essentially, we forgot to dereference as uint8_t *, which can
lead to some suprises if these are misused.
---
 src/core/defs.h | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/core/defs.h b/src/core/defs.h
index 2d73f2961..f367dcc48 100644
--- a/src/core/defs.h
+++ b/src/core/defs.h
@@ -104,25 +104,25 @@ typedef void (*nni_cb)(void *);
 		(ptr)[7] = (uint8_t) ((uint64_t) (u));          \
 	} while (0)
 
-#define NNI_GET16(ptr, v)                               \
-	v = (((uint16_t) ((uint8_t) (ptr)[0])) << 8u) + \
-	    (((uint16_t) (uint8_t) (ptr)[1]))
-
-#define NNI_GET32(ptr, v)                                \
-	v = (((uint32_t) ((uint8_t) (ptr)[0])) << 24u) + \
-	    (((uint32_t) ((uint8_t) (ptr)[1])) << 16u) + \
-	    (((uint32_t) ((uint8_t) (ptr)[2])) << 8u) +  \
-	    (((uint32_t) (uint8_t) (ptr)[3]))
-
-#define NNI_GET64(ptr, v)                                \
-	v = (((uint64_t) ((uint8_t) (ptr)[0])) << 56u) + \
-	    (((uint64_t) ((uint8_t) (ptr)[1])) << 48u) + \
-	    (((uint64_t) ((uint8_t) (ptr)[2])) << 40u) + \
-	    (((uint64_t) ((uint8_t) (ptr)[3])) << 32u) + \
-	    (((uint64_t) ((uint8_t) (ptr)[4])) << 24u) + \
-	    (((uint64_t) ((uint8_t) (ptr)[5])) << 16u) + \
-	    (((uint64_t) ((uint8_t) (ptr)[6])) << 8u) +  \
-	    (((uint64_t) (uint8_t) (ptr)[7]))
+#define NNI_GET16(ptr, v)                                   \
+	v = (((uint16_t) (((uint8_t *) (ptr))[0])) << 8u) + \
+	    ((uint16_t) ((uint8_t *) (ptr))[1])
+
+#define NNI_GET32(ptr, v)                                  \
+	v = (((uint32_t) ((uint8_t *) (ptr))[0]) << 24u) + \
+	    (((uint32_t) ((uint8_t *) (ptr))[1]) << 16u) + \
+	    (((uint32_t) ((uint8_t *) (ptr))[2]) << 8u) +  \
+	    ((uint32_t) ((uint8_t *) (ptr))[3])
+
+#define NNI_GET64(ptr, v)                                  \
+	v = (((uint64_t) ((uint8_t *) (ptr))[0]) << 56u) + \
+	    (((uint64_t) ((uint8_t *) (ptr))[1]) << 48u) + \
+	    (((uint64_t) ((uint8_t *) (ptr))[2]) << 40u) + \
+	    (((uint64_t) ((uint8_t *) (ptr))[3]) << 32u) + \
+	    (((uint64_t) ((uint8_t *) (ptr))[4]) << 24u) + \
+	    (((uint64_t) ((uint8_t *) (ptr))[5]) << 16u) + \
+	    (((uint64_t) ((uint8_t *) (ptr))[6]) << 8u) +  \
+	    ((uint64_t) ((uint8_t *) (ptr))[7])
 
 // Modern CPUs are all little endian.  Let's stop paying the endian tax.