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

Changes for userspace ASAN

This is mostly disabling ASAN for some functions and adjusting overheads.
Code, touching the guest memory, currently cannot be instrumented.
---

diff --git a/open-vm-tools/lib/misc/dynbuf.c b/open-vm-tools/lib/misc/dynbuf.c
index 08cc32526..444f7e6b6 100644
--- a/open-vm-tools/lib/misc/dynbuf.c
+++ b/open-vm-tools/lib/misc/dynbuf.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -29,6 +29,7 @@
 
 #include "vmware.h"
 #include "dynbuf.h"
+#include "asan_common.h"
 
 
 /*
@@ -332,6 +333,8 @@ 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: