da53445dea
recursive pagetable for 32-bit PV guests (XSA-185) 57d1563d-x86-32on64-don-t-allow-recursive-page-tables-from-L3.patch - bsc#995789 - VUL-0: CVE-2016-7093: xen: x86: Mishandling of instruction pointer truncation during emulation (XSA-186) 57d15679-x86-emulate-Correct-boundary-interactions-of-emulated-insns.patch 57d18642-hvm-fep-Allow-test-insns-crossing-1-0-boundary.patch - bsc#995792 - VUL-0: CVE-2016-7094: xen: x86 HVM: Overflow of sh_ctxt->seg_reg[] (XSA-187) 57d1569a-x86-shadow-Avoid-overflowing-sh_ctxt-seg_reg.patch 57d18642-x86-segment-Bounds-check-accesses-to-emulation-ctxt-seg_reg.patch - bsc#991934 - xen hypervisor crash in csched_acct 57c96df3-credit1-fix-a-race-when-picking-initial-pCPU.patch - Upstream patches from Jan 57c4412b-x86-HVM-add-guarding-logic-for-VMX-specific-code.patch 57c57f73-libxc-correct-max_pfn-calculation-for-saving-domain.patch 57c805bf-x86-levelling-restrict-non-architectural-OSXSAVE-handling.patch 57c805c1-x86-levelling-pass-vcpu-to-ctxt_switch_levelling.patch 57c805c3-x86-levelling-provide-architectural-OSXSAVE-handling.patch 57c82be2-x86-32on64-adjust-call-gate-emulation.patch 57c96e2c-x86-correct-PT_NOTE-file-position.patch 57cfed43-VMX-correct-feature-checks-for-MPX-and-XSAVES.patch - bsc#989679 - [pvusb feature] USB device not found when 'virsh detach-device guest usb.xml' 57c93e52-fix-error-in-libxl_device_usbdev_list.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=450
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
# Commit 81caac0cd0f56b0052a7884e6bd99e3a652ddd59
|
|
# Date 2016-08-29 16:05:31 +0200
|
|
# Author Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/HVM: add guarding logic for VMX specific code
|
|
|
|
The struct hvm_domain.vmx is defined in a union along with the svm.
|
|
This can causes issue for SVM since this code is used in the common
|
|
scheduling code for x86. The logic must check for cpu_has_vmx before
|
|
accessing the hvm_domain.vmx sturcture.
|
|
|
|
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
|
|
Acked-by: Jan Beulich <jbeulich@suse.com>
|
|
|
|
--- a/xen/include/asm-x86/hvm/hvm.h
|
|
+++ b/xen/include/asm-x86/hvm/hvm.h
|
|
@@ -611,7 +611,7 @@ unsigned long hvm_cr4_guest_reserved_bit
|
|
struct vcpu *v_ = (v); \
|
|
struct domain *d_ = v_->domain; \
|
|
if ( has_hvm_container_domain(d_) && \
|
|
- d_->arch.hvm_domain.vmx.vcpu_block ) \
|
|
+ (cpu_has_vmx && d_->arch.hvm_domain.vmx.vcpu_block) ) \
|
|
d_->arch.hvm_domain.vmx.vcpu_block(v_); \
|
|
})
|
|
|