The printf() in init_hypercalls() only ends up in the hypervisor console log,
so extraversion really isn't interesting.
The SMBios table doesn't need extraversion, and removing it reduces the
ability for a guest to fingerprint the exact hypervisor it is running under.
Signed-off-by: Andrew Cooper
---
CC: Jan Beulich
CC: Wei Liu
CC: Roger Pau Monné
---
tools/firmware/hvmloader/hvmloader.c | 4 +---
tools/firmware/hvmloader/smbios.c| 10 --
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/tools/firmware/hvmloader/hvmloader.c
b/tools/firmware/hvmloader/hvmloader.c
index 598a226278..99c8841790 100644
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -121,7 +121,6 @@ static void init_hypercalls(void)
uint32_t eax, ebx, ecx, edx;
unsigned long i;
char signature[13];
-xen_extraversion_t extraversion;
uint32_t base;
for ( base = 0x4000; base < 0x4001; base += 0x100 )
@@ -146,8 +145,7 @@ static void init_hypercalls(void)
/* Print version information. */
cpuid(base + 1, , , , );
-hypercall_xen_version(XENVER_extraversion, extraversion);
-printf("Detected Xen v%u.%u%s\n", eax >> 16, eax & 0x, extraversion);
+printf("Detected Xen v%u.%u\n", eax >> 16, eax & 0x);
}
/* Replace possibly erroneous memory-size CMOS fields with correct values. */
diff --git a/tools/firmware/hvmloader/smbios.c
b/tools/firmware/hvmloader/smbios.c
index 97a054e9e3..46ba1cb7b3 100644
--- a/tools/firmware/hvmloader/smbios.c
+++ b/tools/firmware/hvmloader/smbios.c
@@ -256,7 +256,6 @@ hvm_write_smbios_tables(
xen_domain_handle_t uuid;
uint16_t xen_major_version, xen_minor_version;
uint32_t xen_version;
-char xen_extra_version[XEN_EXTRAVERSION_LEN];
/* guess conservatively on buffer length for Xen version string */
char xen_version_str[80];
/* temporary variables used to build up Xen version string */
@@ -274,8 +273,6 @@ hvm_write_smbios_tables(
xen_major_version = (uint16_t) (xen_version >> 16);
xen_minor_version = (uint16_t) xen_version;
-hypercall_xen_version(XENVER_extraversion, xen_extra_version);
-
/* build up human-readable Xen version string */
p = xen_version_str;
len = 0;
@@ -302,13 +299,6 @@ hvm_write_smbios_tables(
strcpy(p, tmp);
p += tmp_len;
-tmp_len = strlen(xen_extra_version);
-len += tmp_len;
-if ( len >= sizeof(xen_version_str) )
-goto error_out;
-strcpy(p, xen_extra_version);
-p += tmp_len;
-
xen_version_str[sizeof(xen_version_str)-1] = '\0';
/* scratch_start is a safe large memory area for scratch. */
--
2.11.0
___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel