diff options
| author | Keir Fraser <keir@xen.org> | 2011-01-10 08:42:32 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-01-10 08:42:32 +0000 |
| commit | a85a31246a56e513597a3edc0de33d32856bdeed (patch) | |
| tree | aabe0d9e3a377e91e0e516be9a433505bdd7948c | |
| parent | 6cd8743754e43125aba681f11b94e2d8bbb413e0 (diff) | |
| download | xen-a85a31246a56e513597a3edc0de33d32856bdeed.tar.gz xen-a85a31246a56e513597a3edc0de33d32856bdeed.tar.bz2 xen-a85a31246a56e513597a3edc0de33d32856bdeed.zip | |
x86-64: don't allow wrmsr to MSR_FAM10H_MMIO_CONF_BASE when Xen itself is using it
Signed-off-by: Jan Beulich <jbeulich@novell.com>
| -rw-r--r-- | xen/arch/x86/traps.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index f7d8f69c9c..6e2c5c7311 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1694,6 +1694,10 @@ static int is_cpufreq_controller(struct domain *d) (d->domain_id == 0)); } +#ifdef CONFIG_X86_64 +#include "x86_64/mmconfig.h" +#endif + static int emulate_privileged_op(struct cpu_user_regs *regs) { struct vcpu *v = current; @@ -2288,7 +2292,14 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) goto fail; if ( !IS_PRIV(v->domain) ) break; - if ( (rdmsr_safe(MSR_FAM10H_MMIO_CONF_BASE, val) != 0) || + if ( (rdmsr_safe(MSR_FAM10H_MMIO_CONF_BASE, val) != 0) ) + goto fail; + if ( +#ifdef CONFIG_X86_64 + (pci_probe & PCI_PROBE_MMCONF) && + (pci_probe & PCI_CHECK_ENABLE_AMD_MMCONF) ? + val != msr_content : +#endif ((val ^ msr_content) & ~( FAM10H_MMIO_CONF_ENABLE | (FAM10H_MMIO_CONF_BUSRANGE_MASK << |