Commit a575813b authored by Wanpeng Li's avatar Wanpeng Li Committed by Radim Krčmář
Browse files

KVM: x86: Fix load damaged SSEx MXCSR register 



Reported by syzkaller:

   BUG: unable to handle kernel paging request at ffffffffc07f6a2e
   IP: report_bug+0x94/0x120
   PGD 348e12067
   P4D 348e12067
   PUD 348e14067
   PMD 3cbd84067
   PTE 80000003f7e87161

   Oops: 0003 [#1] SMP
   CPU: 2 PID: 7091 Comm: kvm_load_guest_ Tainted: G           OE   4.11.0+ #8
   task: ffff92fdfb525400 task.stack: ffffbda6c3d04000
   RIP: 0010:report_bug+0x94/0x120
   RSP: 0018:ffffbda6c3d07b20 EFLAGS: 00010202
    do_trap+0x156/0x170
    do_error_trap+0xa3/0x170
    ? kvm_load_guest_fpu.part.175+0x12a/0x170 [kvm]
    ? mark_held_locks+0x79/0xa0
    ? retint_kernel+0x10/0x10
    ? trace_hardirqs_off_thunk+0x1a/0x1c
    do_invalid_op+0x20/0x30
    invalid_op+0x1e/0x30
   RIP: 0010:kvm_load_guest_fpu.part.175+0x12a/0x170 [kvm]
    ? kvm_load_guest_fpu.part.175+0x1c/0x170 [kvm]
    kvm_arch_vcpu_ioctl_run+0xed6/0x1b70 [kvm]
    kvm_vcpu_ioctl+0x384/0x780 [kvm]
    ? kvm_vcpu_ioctl+0x384/0x780 [kvm]
    ? sched_clock+0x13/0x20
    ? __do_page_fault+0x2a0/0x550
    do_vfs_ioctl+0xa4/0x700
    ? up_read+0x1f/0x40
    ? __do_page_fault+0x2a0/0x550
    SyS_ioctl+0x79/0x90
    entry_SYSCALL_64_fastpath+0x23/0xc2

SDM mentioned that "The MXCSR has several reserved bits, and attempting to write
a 1 to any of these bits will cause a general-protection exception(#GP) to be
generated". The syzkaller forks' testcase overrides xsave area w/ random values
and steps on the reserved bits of MXCSR register. The damaged MXCSR register
values of guest will be restored to SSEx MXCSR register before vmentry. This
patch fixes it by catching userspace override MXCSR register reserved bits w/
random values and bails out immediately.

Reported-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarWanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 4769886b

arch/x86/kernel/fpu/init.c

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ static void fpu__init_system_early_generic(struct cpuinfo_x86 *c) 
 * Boot time FPU feature detection code:

 */

unsigned int mxcsr_feature_mask __read_mostly = 0xffffffffu;

EXPORT_SYMBOL_GPL(mxcsr_feature_mask);



static void __init fpu__init_system_mxcsr(void)

{

arch/x86/kvm/x86.c

+7 −2
Original line number Diff line number Diff line
@@ -3288,11 +3288,14 @@ static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu, 
	}

}



#define XSAVE_MXCSR_OFFSET 24



static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,

					struct kvm_xsave *guest_xsave)

{

	u64 xstate_bv =

		*(u64 *)&guest_xsave->region[XSAVE_HDR_OFFSET / sizeof(u32)];

	u32 mxcsr = *(u32 *)&guest_xsave->region[XSAVE_MXCSR_OFFSET / sizeof(u32)];



	if (boot_cpu_has(X86_FEATURE_XSAVE)) {

		/*
@@ -3300,11 +3303,13 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu, 
		 * CPUID leaf 0xD, index 0, EDX:EAX.  This is for compatibility

		 * with old userspace.

		 */

		if (xstate_bv & ~kvm_supported_xcr0())

		if (xstate_bv & ~kvm_supported_xcr0() ||

			mxcsr & ~mxcsr_feature_mask)

			return -EINVAL;

		load_xsave(vcpu, (u8 *)guest_xsave->region);

	} else {

		if (xstate_bv & ~XFEATURE_MASK_FPSSE)

		if (xstate_bv & ~XFEATURE_MASK_FPSSE ||

			mxcsr & ~mxcsr_feature_mask)

			return -EINVAL;

		memcpy(&vcpu->arch.guest_fpu.state.fxsave,

			guest_xsave->region, sizeof(struct fxregs_state));

CRA Git | Maintained and supported by SUSTech CRA and CCSE