From: Karel Zak <kzak@redhat.com>
Date: Thu, 3 Nov 2016 09:53:09 +0000 (+0100)
Subject: lscpu: disable is_vmware_platform() for non-root users
X-Git-Tag: v2.29~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5d61108e4e309843d8bdeb84d29d803971bf676;p=thirdparty%2Futil-linux.git

lscpu: disable is_vmware_platform() for non-root users

References: http://www.spinics.net/lists/util-linux-ng/msg13302.html
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 52a944d3a9..bd702b0ae1 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -861,6 +861,15 @@ is_vmware_platform(void)
 	uint32_t eax, ebx, ecx, edx;
 	struct sigaction act, oact;
 
+	/*
+	 * FIXME: Not reliable for non-root users. Note it works as expected if
+	 * vmware_bdoor() is not optimized for PIE, but then it fails to build
+	 * on 32bit x86 systems. See lscpu git log for more details (commit
+	 * 7845b91dbc7690064a2be6df690e4aaba728fb04).     kzak [3-Nov-2016]
+	 */
+	if (getuid() != 0)
+		return 0;
+
 	/*
 	 * The assembly routine for vmware detection works
 	 * fine under vmware, even if ran as regular user. But