a11c33863f
5281fad4-numa-sched-leave-node-affinity-alone-if-not-in-auto-mode.patch 52820823-nested-SVM-adjust-guest-handling-of-structure-mappings.patch 52820863-VMX-don-t-crash-processing-d-debug-key.patch 5282492f-x86-eliminate-has_arch_mmios.patch 52864df2-credit-Update-other-parameters-when-setting-tslice_ms.patch 52864f30-fix-leaking-of-v-cpu_affinity_saved-on-domain-destruction.patch 5289d225-nested-VMX-don-t-ignore-mapping-errors.patch 528a0eb0-x86-consider-modules-when-cutting-off-memory.patch 528f606c-x86-hvm-reset-TSC-to-0-after-domain-resume-from-S3.patch 528f609c-x86-crash-disable-the-watchdog-NMIs-on-the-crashing-cpu.patch 52932418-x86-xsave-fix-nonlazy-state-handling.patch - Add missing requires to pciutils package for xend-tools - bnc#851749 - Xen service file does not call xend properly xend.service - bnc#851386 - VUL-0: xen: XSA-78: Insufficient TLB flushing in VT-d (iommu) code 528a0e5b-TLB-flushing-in-dma_pte_clear_one.patch - bnc#849667 - VUL-0: xen: XSA-74: Lock order reversal between page_alloc_lock and mm_rwlock CVE-2013-4553-xsa74.patch - bnc#849665 - VUL-0: CVE-2013-4551: xen: XSA-75: Host crash due to guest VMX instruction execution 52809208-nested-VMX-VMLANUCH-VMRESUME-emulation-must-check-permission-1st.patch - bnc#849668 - VUL-0: xen: XSA-76: Hypercalls exposed to privilege rings 1 and 2 of HVM guests OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=279
83 lines
2.9 KiB
Diff
83 lines
2.9 KiB
Diff
# Commit 9d89100ba8b7b02adb7c2e89ef7c81e734942e7c
|
|
# Date 2013-11-05 14:51:53 +0100
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/HVM: 32-bit IN result must be zero-extended to 64 bits
|
|
|
|
Just like for all other operations with 32-bit operand size.
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
# Commit 1e521eddeb51a9f1bf0e4dd1d17efc873eafae41
|
|
# Date 2013-11-15 11:01:49 +0100
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/HVM: 32-bit IN result must be zero-extended to 64 bits (part 2)
|
|
|
|
Just spotted a counterpart of what commit 9d89100b (same title) dealt
|
|
with.
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- a/xen/arch/x86/hvm/io.c
|
|
+++ b/xen/arch/x86/hvm/io.c
|
|
@@ -221,13 +221,15 @@ int handle_mmio_with_translation(unsigne
|
|
return handle_mmio();
|
|
}
|
|
|
|
-int handle_pio(uint16_t port, int size, int dir)
|
|
+int handle_pio(uint16_t port, unsigned int size, int dir)
|
|
{
|
|
struct vcpu *curr = current;
|
|
struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io;
|
|
unsigned long data, reps = 1;
|
|
int rc;
|
|
|
|
+ ASSERT((size - 1) < 4 && size != 3);
|
|
+
|
|
if ( dir == IOREQ_WRITE )
|
|
data = guest_cpu_user_regs()->eax;
|
|
|
|
@@ -237,7 +239,12 @@ int handle_pio(uint16_t port, int size,
|
|
{
|
|
case X86EMUL_OKAY:
|
|
if ( dir == IOREQ_READ )
|
|
- memcpy(&guest_cpu_user_regs()->eax, &data, vio->io_size);
|
|
+ {
|
|
+ if ( size == 4 ) /* Needs zero extension. */
|
|
+ guest_cpu_user_regs()->rax = (uint32_t)data;
|
|
+ else
|
|
+ memcpy(&guest_cpu_user_regs()->rax, &data, size);
|
|
+ }
|
|
break;
|
|
case X86EMUL_RETRY:
|
|
if ( vio->io_state != HVMIO_awaiting_completion )
|
|
@@ -281,8 +288,10 @@ void hvm_io_assist(void)
|
|
(void)handle_mmio();
|
|
break;
|
|
case HVMIO_handle_pio_awaiting_completion:
|
|
- memcpy(&guest_cpu_user_regs()->eax,
|
|
- &p->data, vio->io_size);
|
|
+ if ( vio->io_size == 4 ) /* Needs zero extension. */
|
|
+ guest_cpu_user_regs()->rax = (uint32_t)p->data;
|
|
+ else
|
|
+ memcpy(&guest_cpu_user_regs()->rax, &p->data, vio->io_size);
|
|
break;
|
|
default:
|
|
break;
|
|
--- a/xen/include/asm-x86/hvm/io.h
|
|
+++ b/xen/include/asm-x86/hvm/io.h
|
|
@@ -119,7 +119,7 @@ void send_timeoffset_req(unsigned long t
|
|
void send_invalidate_req(void);
|
|
int handle_mmio(void);
|
|
int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn);
|
|
-int handle_pio(uint16_t port, int size, int dir);
|
|
+int handle_pio(uint16_t port, unsigned int size, int dir);
|
|
void hvm_interrupt_post(struct vcpu *v, int vector, int type);
|
|
void hvm_io_assist(void);
|
|
void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq,
|