From: Cristian Rodríguez <crrodriguez@opensuse.org>
Date: Sat, 30 May 2015 18:51:41 +0000 (-0300)
Subject: sys-utils: lscpu segfaults when built with -fsanitize=address
X-Git-Tag: v2.27-rc1~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a680b2abe725f4d52403652688a94490f2023752;p=thirdparty%2Futil-linux.git

sys-utils: lscpu segfaults when built with -fsanitize=address

This is expected and a false positive, exclude the vmware detection
trick when __SANITIZE_ADDRESS__ is defined.
---

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index b36d1daa79..f695a320de 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -34,7 +34,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#if defined(__x86_64__) || defined(__i386__)
+#if (defined(__x86_64__) || defined(__i386__)) && !defined(__SANITIZE_ADDRESS__)
 # define INCLUDE_VMWARE_BDOOR
 #endif