From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:35 +0000 (-0700)
Subject: Re-enable ASAN for DynBuf_Append()
X-Git-Tag: stable-10.2.0~247
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f424d59444ae7718f5e47ebcd5b417df8acea456;p=thirdparty%2Fopen-vm-tools.git

Re-enable ASAN for DynBuf_Append()

The problem is incorrectly instrumented callers.
---

diff --git a/open-vm-tools/lib/misc/dynbuf.c b/open-vm-tools/lib/misc/dynbuf.c
index acae23d44..76b250a5d 100644
--- a/open-vm-tools/lib/misc/dynbuf.c
+++ b/open-vm-tools/lib/misc/dynbuf.c
@@ -30,12 +30,6 @@
 #include "vmware.h"
 #include "dynbuf.h"
 
-#ifdef VMX86_SERVER
-#include "asan_common.h"
-#else
-#define DISABLE_ASAN
-#endif
-
 /*
  *-----------------------------------------------------------------------------
  *
@@ -337,8 +331,6 @@ DynBuf_Enlarge(DynBuf *b,       // IN/OUT:
  *-----------------------------------------------------------------------------
  */
 
-// XXX The instrumentation assumes that "data" points to the heap, PR 1826914.
-DISABLE_ASAN
 Bool
 DynBuf_Append(DynBuf *b,        // IN/OUT:
               void const *data, // IN: