Attachment 317734 Details for Bug 463573 – Check DMI before accessing backdoor port

[patch] Check DMI before accessing backdoor port

backdoor_fix.patch (text/plain), 3.99 KB, created by Alok Kataria on 2008-09-25 21:33:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alok Kataria

Created: 2008-09-25 21:33:11 UTC

Size: 3.99 KB

patch

obsolete

>Check DMI string for VMware
>
>From: Alok N Kataria <akataria@vmware.com>
>
>Check the DMI string to confirm that we are running on VMware, we actually rely
>on the Serial Number to contain "VMware". Only after this check do we poke the
>backdoor ports.
>The DMI checks are necessary since their can be cases when the port may be used
>by an actual hardware device accessing which can have adverse effects.
>
>Signed-off-by: Alok N Kataria <akataria@vmware.com>
>---
>
> arch/i386/kernel/cpu/common.c |    8 --------
> arch/i386/kernel/setup.c      |    9 +++++++++
> arch/x86_64/kernel/setup.c    |   15 ++++++++-------
> 3 files changed, 17 insertions(+), 15 deletions(-)
>
>
>diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
>index bf2ba97..952cd81 100644
>--- a/arch/i386/kernel/cpu/common.c
>+++ b/arch/i386/kernel/cpu/common.c
>@@ -5,7 +5,6 @@
> #include <linux/module.h>
> #include <linux/percpu.h>
> #include <linux/bootmem.h>
>-#include <linux/vmware_backdoor.h>
> 
> #include <asm/semaphore.h>
> #include <asm/processor.h>
>@@ -183,12 +182,6 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early)
> 	this_cpu = &default_cpu;
> }
> 
>-static void __cpuinit get_hypervisor_vendor(struct cpuinfo_x86 *c)
>-{
>-	if (vmware_platform())
>-		c->x86_hyper_vendor = X86_HYPER_VENDOR_VMWARE;
>-}
>-
> static int __init x86_fxsr_setup(char * s)
> {
> 	disable_x86_fxsr = 1;
>@@ -271,7 +264,6 @@ static void __init early_cpu_detect(void)
> 		if (cap0 & (1<<19))
> 			c->x86_cache_alignment = ((misc >> 8) & 0xff) * 8;
> 	}
>-	get_hypervisor_vendor(c);
> }
> 
> void __cpuinit generic_identify(struct cpuinfo_x86 * c)
>diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
>index 34b515d..6d4aebf 100644
>--- a/arch/i386/kernel/setup.c
>+++ b/arch/i386/kernel/setup.c
>@@ -48,6 +48,7 @@
> #include <linux/crash_dump.h>
> #include <linux/dmi.h>
> #include <linux/pfn.h>
>+#include <linux/vmware_backdoor.h>
> 
> #include <video/edid.h>
> 
>@@ -1458,6 +1459,13 @@ static void set_mca_bus(int x)
> static void set_mca_bus(int x) { }
> #endif
> 
>+static void __cpuinit get_hypervisor_vendor(struct cpuinfo_x86 *c)
>+{
>+	/* Usually the serial number has VMware as part of the string */
>+	if (dmi_name_in_vendors("VMware") && vmware_platform())
>+		c->x86_hyper_vendor = X86_HYPER_VENDOR_VMWARE;
>+}
>+
> /*
>  * Determine if we were loaded by an EFI loader.  If so, then we have also been
>  * passed the efi memmap, systab, etc., so we should use these data structures
>@@ -1564,6 +1572,7 @@ void __init setup_arch(char **cmdline_p)
> 	 */
> 
> 	dmi_scan_machine();
>+	get_hypervisor_vendor(&boot_cpu_data);
> 
> #ifdef CONFIG_X86_GENERICARCH
> 	generic_apic_probe(*cmdline_p);
>diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
>index 4365057..e53b0fa 100644
>--- a/arch/x86_64/kernel/setup.c
>+++ b/arch/x86_64/kernel/setup.c
>@@ -522,6 +522,13 @@ static void discover_ebda(void)
> 		ebda_size = 64*1024;
> }
> 
>+static void __cpuinit get_hypervisor_vendor(struct cpuinfo_x86 *c)
>+{
>+	/* Usually the serial number has VMware as part of the string */
>+	if (dmi_name_in_vendors("VMware") && vmware_platform())
>+		c->x86_hyper_vendor = X86_HYPER_VENDOR_VMWARE;
>+}
>+
> void __init setup_arch(char **cmdline_p)
> {
> 	printk(KERN_INFO "Command line: %s\n", saved_command_line);
>@@ -571,6 +578,7 @@ void __init setup_arch(char **cmdline_p)
> 	init_memory_mapping(0, (end_pfn_map << PAGE_SHIFT));
> 
> 	dmi_scan_machine();
>+	get_hypervisor_vendor(&boot_cpu_data);
> 
> #ifdef CONFIG_ACPI
> 	/*
>@@ -1046,12 +1054,6 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)
> 		c->x86_vendor = X86_VENDOR_UNKNOWN;
> }
> 
>-static void __cpuinit get_hypervisor_vendor(struct cpuinfo_x86 *c)
>-{
>-	if (vmware_platform())
>-		c->x86_hyper_vendor = X86_HYPER_VENDOR_VMWARE;
>-}
>-
> struct cpu_model_info {
> 	int vendor;
> 	int family;
>@@ -1085,7 +1087,6 @@ void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)
> 	      (unsigned int *)&c->x86_vendor_id[4]);
> 		
> 	get_cpu_vendor(c);
>-	get_hypervisor_vendor(c);
> 
> 	/* Initialize the standard set of capabilities */
> 	/* Note that the vendor-specific code below might override */

Actions: View | Diff

Attachments on bug 463573: 317536 | 317537 | 317538 | 317727 | 317728 | 317734 | 317735 | 319716 | 319717 | 319718 | 319719 | 319720 | 319799 | 319817 | 320098 | 320133 | 320485 | 321043 | 325724 | 325725 | 325726 | 325727 | 325728 | 326672 | 329135 | 329213 | 332979