Unverified Commit fc52d496 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13209 fix CVE-2024-50115 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liao Chen <liaochen4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JYFRVIQUNFZ2APT5734LHTISCQPTYC6C/ 
fix CVE-2024-50115

Sean Christopherson (1):
  KVM: nSVM: Ignore nCR3[4:0] when loading PDPTEs from memory


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IB2BXL 
 
Link:https://gitee.com/openeuler/kernel/pulls/13209

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 0a813b20 a5f9a040

arch/x86/kvm/svm.c

+5 −1
Original line number Diff line number Diff line
@@ -2944,8 +2944,12 @@ static u64 nested_svm_get_tdp_pdptr(struct kvm_vcpu *vcpu, int index) 
	u64 pdpte;

	int ret;



	/*

	* Note, nCR3 is "assumed" to be 32-byte aligned, i.e. the CPU ignores

	* nCR3[4:0] when loading PDPTEs from memory.

	*/

	ret = kvm_vcpu_read_guest_page(vcpu, gpa_to_gfn(__sme_clr(cr3)), &pdpte,

				       offset_in_page(cr3) + index * 8, 8);

				       (cr3 & GENMASK(11, 5)) + index * 8, 8);

	if (ret)

		return 0;

	return pdpte;