summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-03-02 13:46:29 -0800
committerGuy Harris <guy@alum.mit.edu>2015-05-20 15:28:13 -0700
commitf35ae3d61da48225291458062b0278938076ab38 (patch)
tree217e65402670bc323707a42df442db8094b7dd7f
parenta2a8904b4e200b0d5e82db3316591f215c760090 (diff)
downloadtcpdump-4.6.tar.gz
Fix the pointer tests in the non-ndoified TTEST2() macro as well.tcpdump-4.6
-rw-r--r--interface.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/interface.h b/interface.h
index 299d010e..03463751 100644
--- a/interface.h
+++ b/interface.h
@@ -104,9 +104,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))