From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 2 Mar 2015 21:46:29 +0000 (-0800)
Subject: Fix the pointer tests in the non-ndoified TTEST2() macro as well.
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/070e9e9d3e084d8f1a700e348e0ac909b1468731

Fix the pointer tests in the non-ndoified TTEST2() macro as well.
---

diff --git a/interface.h b/interface.h
index bb794149..ab4899e8 100644
--- a/interface.h
+++ b/interface.h
@@ -110,9 +110,21 @@ extern int32_t thiszone;	/* seconds offset from gmt to local time */
  * that "snapend - (l)" underflows.
  *
  * The check is for <= rather than < because "l" might be 0.
+ *
+ * We cast the pointers to uintptr_t to make sure that the compiler
+ * doesn't optimize away any of these tests (which it is allowed to
+ * do, as adding an integer to, or subtracting an integer from, a
+ * pointer assumes that the pointer is a pointer to an element of an
+ * array and that the result of the addition or subtraction yields a
+ * pointer to another member of the array, so that, for example, if
+ * you subtract a positive integer from a pointer, the result is
+ * guaranteed to be less than the original pointer value). See
+ *
+ *	http://www.kb.cert.org/vuls/id/162289
  */
-#define TTEST2(var, l) (snapend - (l) <= snapend && \
-			(const u_char *)&(var) <= snapend - (l))
+#define TTEST2(var, l) \
+	((uintptr_t)snapend - (l) <= (uintptr_t)snapend && \
+	   (uintptr_t)&(var) <= (uintptr_t)snapend - (l))
 
 /* True if "var" was captured */
 #define TTEST(var) TTEST2(var, sizeof(var))