Skip to contentSkip to conversation

Fix null pointer dereference in kvm_msr_ignored_check

PATCH Superseded Peter Xu 4 participants 9 messages Oct 25, 2020 – Oct 31, 2020

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Peter Xu

author
#0 lore raw

cover Fix null pointer dereference in kvm_msr_ignored_check

Bug report: https://lore.kernel.org/kvm/[email protected]%2F/

Unit test attached, which can reproduce the same issue.

Thanks,

Peter Xu (2):
KVM: selftests: Add get featured msrs test case
KVM: X86: Fix null pointer reference for KVM_GET_MSRS

 arch/x86/kvm/x86.c                            |  4 +-
 .../testing/selftests/kvm/include/kvm_util.h  |  3 +
 tools/testing/selftests/kvm/lib/kvm_util.c    | 14 +++++
 .../testing/selftests/kvm/x86_64/state_test.c | 58 +++++++++++++++++++
 4 files changed, 77 insertions(+), 2 deletions(-)
Signature · 1 line
2.26.2
author
#1 lore raw

PATCH 1/2 KVM: selftests: Add get featured msrs test case

Try to fetch any supported featured msr. Currently it won't fail, so at least we can check against valid ones (which should be >0).

This reproduces [1] too by trying to fetch one invalid msr there.

[1] https://bugzilla.kernel.org/show_bug.cgi?id=209845

---
 .../testing/selftests/kvm/include/kvm_util.h  |  3 +
 tools/testing/selftests/kvm/lib/kvm_util.c    | 14 +++++
 .../testing/selftests/kvm/x86_64/state_test.c | 58 +++++++++++++++++++
 3 files changed, 75 insertions(+)
tools/testing/selftests/kvm/include/kvm_util.h +3 -0
index 919e161dd289..e34cf263b20a 100644
@@ -66,6 +66,9 @@ int vm_enable_cap(struct kvm_vm *vm, struct kvm_enable_cap *cap);
 
 struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm);
 struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm);
+void kvm_vm_get_msr_feature_index_list(struct kvm_vm *vm,
+				       struct kvm_msr_list *list);
+int kvm_vm_get_feature_msrs(struct kvm_vm *vm, struct kvm_msrs *msrs);
 void kvm_vm_free(struct kvm_vm *vmp);
 void kvm_vm_restart(struct kvm_vm *vmp, int perm);
 void kvm_vm_release(struct kvm_vm *vmp);
tools/testing/selftests/kvm/lib/kvm_util.c +14 -0
index 74776ee228f2..3c16fa044335 100644
@@ -132,6 +132,20 @@ static const struct vm_guest_mode_params vm_guest_mode_params[] = {
 _Static_assert(sizeof(vm_guest_mode_params)/sizeof(struct vm_guest_mode_params) == NUM_VM_MODES,
 	       "Missing new mode params?");
 
+void kvm_vm_get_msr_feature_index_list(struct kvm_vm *vm,
+				       struct kvm_msr_list *list)
+{
+	int r = ioctl(vm->kvm_fd, KVM_GET_MSR_FEATURE_INDEX_LIST, list);
+
+	TEST_ASSERT(r == 0, "KVM_GET_MSR_FEATURE_INDEX_LIST failed: %d\n",
+		    -errno);
+}
+
+int kvm_vm_get_feature_msrs(struct kvm_vm *vm, struct kvm_msrs *msrs)
+{
+	return ioctl(vm->kvm_fd, KVM_GET_MSRS, msrs);
+}
+
 /*
  * VM Create
  *
tools/testing/selftests/kvm/x86_64/state_test.c +58 -0

70 lines not on this page · raw message

Signature · 1 line
2.26.2
#2 lore raw

Re: [PATCH 1/2] KVM: selftests: Add get featured msrs test case

Quoted 39 lines · Peter Xu

Try to fetch any supported featured msr. Currently it won't fail, so at least we can check against valid ones (which should be >0).

This reproduces [1] too by trying to fetch one invalid msr there.

[1] https://bugzilla.kernel.org/show_bug.cgi?id=209845

---
 .../testing/selftests/kvm/include/kvm_util.h  |  3 +
 tools/testing/selftests/kvm/lib/kvm_util.c    | 14 +++++
 .../testing/selftests/kvm/x86_64/state_test.c | 58 +++++++++++++++++++
 3 files changed, 75 insertions(+)
tools/testing/selftests/kvm/include/kvm_util.h +3 -0
index 919e161dd289..e34cf263b20a 100644
@@ -66,6 +66,9 @@ int vm_enable_cap(struct kvm_vm *vm, struct kvm_enable_cap *cap);
 
 struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm);
 struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm);
+void kvm_vm_get_msr_feature_index_list(struct kvm_vm *vm,
+				       struct kvm_msr_list *list);
+int kvm_vm_get_feature_msrs(struct kvm_vm *vm, struct kvm_msrs *msrs);
 void kvm_vm_free(struct kvm_vm *vmp);
 void kvm_vm_restart(struct kvm_vm *vmp, int perm);
 void kvm_vm_release(struct kvm_vm *vmp);
tools/testing/selftests/kvm/lib/kvm_util.c +3 -0
index 74776ee228f2..3c16fa044335 100644
@@ -132,6 +132,20 @@ static const struct vm_guest_mode_params vm_guest_mode_params[] = {
 _Static_assert(sizeof(vm_guest_mode_params)/sizeof(struct vm_guest_mode_params) == NUM_VM_MODES,
 	       "Missing new mode params?");
 
+void kvm_vm_get_msr_feature_index_list(struct kvm_vm *vm,
+				       struct kvm_msr_list *list)
+{

tools/testing/selftests/kvm/lib/kvm_util.c static const struct vm_guest_mode_params vm_guest_mode_params[] = { · line 147

Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +10 -0
+	int r = ioctl(vm->kvm_fd, KVM_GET_MSR_FEATURE_INDEX_LIST, list);
+
+	TEST_ASSERT(r == 0, "KVM_GET_MSR_FEATURE_INDEX_LIST failed: %d\n",
+		    -errno);
+}
+
+int kvm_vm_get_feature_msrs(struct kvm_vm *vm, struct kvm_msrs *msrs)
+{
+	return ioctl(vm->kvm_fd, KVM_GET_MSRS, msrs);
+}

I *think* that the non-written rule for kvm selftests is that functions without '_' prefix check ioctl return value with TEST_ASSERT() and functions with it don't (e.g. _vcpu_run()/vcpu_run()) but maybe it's just me.

tools/testing/selftests/kvm/x86_64/state_test.c

Quoted 8 lines
tools/testing/selftests/kvm/lib/kvm_util.c +1 -0
+
 /*
  * VM Create
  *
tools/testing/selftests/kvm/x86_64/state_test.c +0 -0
index f6c8b9042f8a..7ce9920e526a 100644

I would not overload state_test with this new check and create a new one. The benefit is that when one of these tests fail we still get the result of the other one so it's not 'everything works' vs 'everything is broken' type of log.

Quoted 72 lines
tools/testing/selftests/kvm/x86_64/state_test.c +58 -0
@@ -152,6 +152,61 @@ static void __attribute__((__flatten__)) guest_code(void *arg)
 	GUEST_DONE();
 }
 
+#define  KVM_MSR_FEATURE_N  64
+
+static int test_kvm_get_feature_msr_one(struct kvm_vm *vm, __u32 index,
+					struct kvm_msrs *msrs)
+{
+	msrs->nmsrs = 1;
+	msrs->entries[0].index = index;
+	return kvm_vm_get_feature_msrs(vm, msrs);
+}
+
+static void test_kvm_get_msr_features(struct kvm_vm *vm)
+{
+	struct kvm_msr_list *msr_list;
+	struct kvm_msrs *msrs;
+	int i, ret, sum;
+
+	if (!kvm_check_cap(KVM_CAP_GET_MSR_FEATURES)) {
+		pr_info("skipping kvm get msr features test\n");
+		return;
+	}
+
+	msr_list = calloc(1, sizeof(struct kvm_msr_list) +
+			  sizeof(__u32) * KVM_MSR_FEATURE_N);
+	msr_list->nmsrs = KVM_MSR_FEATURE_N;
+
+	TEST_ASSERT(msr_list, "msr_list allocation failed\n");
+
+	kvm_vm_get_msr_feature_index_list(vm, msr_list);
+
+	msrs = calloc(1, sizeof(struct kvm_msrs) +
+		      sizeof(struct kvm_msr_entry));
+
+	TEST_ASSERT(msrs, "msr entries allocation failed\n");
+
+	sum = 0;
+	for (i = 0; i < msr_list->nmsrs; i++) {
+		ret = test_kvm_get_feature_msr_one(vm, msr_list->indices[i],
+						    msrs);
+		TEST_ASSERT(ret >= 0, "KVM_GET_MSR failed: %d\n", ret);
+		sum += ret;
+	}
+	TEST_ASSERT(sum > 0, "KVM_GET_MSR has no feature msr\n");
+
+	/*
+	 * Test invalid msr.  Note the retcode can be either 0 or 1 depending
+	 * on kvm.ignore_msrs
+	 */
+	ret = test_kvm_get_feature_msr_one(vm, (__u32)-1, msrs);
+	TEST_ASSERT(ret >= 0 && ret <= 1,
+		    "KVM_GET_MSR on invalid msr error: %d\n", ret);
+
+	free(msrs);
+	free(msr_list);
+}
+
 int main(int argc, char *argv[])
 {
 	vm_vaddr_t nested_gva = 0;
@@ -168,6 +223,9 @@ int main(int argc, char *argv[])
 	vcpu_set_cpuid(vm, VCPU_ID, kvm_get_supported_cpuid());
 	run = vcpu_state(vm, VCPU_ID);
 
+	/* Test KVM_GET_MSR for VM */
+	test_kvm_get_msr_features(vm);
+
 	vcpu_regs_get(vm, VCPU_ID, &regs1);
 
 	if (kvm_check_cap(KVM_CAP_NESTED_STATE)) {
Signature · 1 line
Vitaly
#3 lore raw

Re: [PATCH 1/2] KVM: selftests: Add get featured msrs test case

Quoted 11 lines · Vitaly Kuznetsov

tools/testing/selftests/kvm/lib/kvm_util.c static const struct vm_guest_mode_params vm_guest_mode_params[] = { · line 147

Quoted 4 lines · Peter Xu
tools/testing/selftests/kvm/lib/kvm_util.c +4 -0
+int kvm_vm_get_feature_msrs(struct kvm_vm *vm, struct kvm_msrs *msrs)
+{
+	return ioctl(vm->kvm_fd, KVM_GET_MSRS, msrs);
+}

I *think* that the non-written rule for kvm selftests is that functions without '_' prefix check ioctl return value with TEST_ASSERT() and functions with it don't (e.g. _vcpu_run()/vcpu_run()) but maybe it's just me.

Yes, that's the pattern I've been trying to implement. If we want to be strict about it, then we should do a quick scan of the code to ensure its currently consistent. I have it feeling it isn't.

Thanks,
drew

author
#4 lore raw

Re: [PATCH 1/2] KVM: selftests: Add get featured msrs test case

In reply to Vitaly Kuznetsov
Quoted 48 lines · Vitaly Kuznetsov
Quoted 46 lines · Peter Xu

Try to fetch any supported featured msr. Currently it won't fail, so at least we can check against valid ones (which should be >0).

This reproduces [1] too by trying to fetch one invalid msr there.

[1] https://bugzilla.kernel.org/show_bug.cgi?id=209845

---
 .../testing/selftests/kvm/include/kvm_util.h  |  3 +
 tools/testing/selftests/kvm/lib/kvm_util.c    | 14 +++++
 .../testing/selftests/kvm/x86_64/state_test.c | 58 +++++++++++++++++++
 3 files changed, 75 insertions(+)
tools/testing/selftests/kvm/include/kvm_util.h +3 -0
index 919e161dd289..e34cf263b20a 100644
@@ -66,6 +66,9 @@ int vm_enable_cap(struct kvm_vm *vm, struct kvm_enable_cap *cap);
 
 struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm);
 struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm);
+void kvm_vm_get_msr_feature_index_list(struct kvm_vm *vm,
+				       struct kvm_msr_list *list);
+int kvm_vm_get_feature_msrs(struct kvm_vm *vm, struct kvm_msrs *msrs);
 void kvm_vm_free(struct kvm_vm *vmp);
 void kvm_vm_restart(struct kvm_vm *vmp, int perm);
 void kvm_vm_release(struct kvm_vm *vmp);
tools/testing/selftests/kvm/lib/kvm_util.c +10 -0
index 74776ee228f2..3c16fa044335 100644
@@ -132,6 +132,20 @@ static const struct vm_guest_mode_params vm_guest_mode_params[] = {
 _Static_assert(sizeof(vm_guest_mode_params)/sizeof(struct vm_guest_mode_params) == NUM_VM_MODES,
 	       "Missing new mode params?");
 
+void kvm_vm_get_msr_feature_index_list(struct kvm_vm *vm,
+				       struct kvm_msr_list *list)
+{
+	int r = ioctl(vm->kvm_fd, KVM_GET_MSR_FEATURE_INDEX_LIST, list);
+
+	TEST_ASSERT(r == 0, "KVM_GET_MSR_FEATURE_INDEX_LIST failed: %d\n",
+		    -errno);
+}
+
+int kvm_vm_get_feature_msrs(struct kvm_vm *vm, struct kvm_msrs *msrs)
Quoted 8 lines

tools/testing/selftests/kvm/lib/kvm_util.c static const struct vm_guest_mode_params vm_guest_mode_params[] = { · line 147

Quoted 3 lines
tools/testing/selftests/kvm/lib/kvm_util.c +3 -0
+{
+	return ioctl(vm->kvm_fd, KVM_GET_MSRS, msrs);
+}

I *think* that the non-written rule for kvm selftests is that functions without '_' prefix check ioctl return value with TEST_ASSERT() and functions with it don't (e.g. _vcpu_run()/vcpu_run()) but maybe it's just me.

Sure, will fix it up.

Quoted 14 lines

tools/testing/selftests/kvm/x86_64/state_test.c

Quoted 9 lines
tools/testing/selftests/kvm/lib/kvm_util.c +1 -0
+
 /*
  * VM Create
  *
tools/testing/selftests/kvm/x86_64/state_test.c +0 -0
index f6c8b9042f8a..7ce9920e526a 100644

I would not overload state_test with this new check and create a new one. The benefit is that when one of these tests fail we still get the result of the other one so it's not 'everything works' vs 'everything is broken' type of log.

IMHO it's not extremely important on knowingg which binary failed - afaiu, kernel selftests are really for an "all pass", so if anything fails, we dig.

Another thing, state_test.c has a comment (at the top):

/*
* KVM_GET/SET_* tests
*
* Copyright (C) 2018, Red Hat, Inc.
...

Shouldn't KVM_GET_MSRS suites here? :)

Thanks,

Signature · 1 line
Peter Xu
author
#5 lore raw

PATCH 2/2 KVM: X86: Fix null pointer reference for KVM_GET_MSRS

In reply to Peter Xu

kvm_msr_ignored_check() could trigger a null pointer reference if ignore_msrs=Y and report_ignore_msrs=Y when try to fetch an invalid feature msr using the global KVM_GET_MSRS. Degrade the error report to not rely on vcpu since that information (index, rip) is not as important as msr index/data after all.

Fixes 12bc2132b15e0a96
---
 arch/x86/kvm/x86.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
index ce856e0ece84..5993fbd6d2c5 100644
@@ -259,8 +259,8 @@ static int kvm_msr_ignored_check(struct kvm_vcpu *vcpu, u32 msr,
 
 	if (ignore_msrs) {
 		if (report_ignored_msrs)
-			vcpu_unimpl(vcpu, "ignored %s: 0x%x data 0x%llx\n",
-				    op, msr, data);
+			kvm_pr_unimpl("ignored %s: 0x%x data 0x%llx\n",
+				      op, msr, data);
 		/* Mask the error */
 		return 0;
 	} else {
Signature · 1 line
2.26.2
#6 lore raw

Re: [PATCH 2/2] KVM: X86: Fix null pointer reference for KVM_GET_MSRS

Quoted 1 line · Peter Xu

kvm_msr_ignored_check() could trigger a null pointer reference

'dereference' but I'd also clarify that 'vcpu' is NULL.

Quoted 6 lines

if ignore_msrs=Y
and report_ignore_msrs=Y when try to fetch an invalid feature msr using the global KVM_GET_MSRS. Degrade the error report to not rely on vcpu since that information (index, rip) is not as important as msr index/data after all.

Fixes 12bc2132b15e0a96
Fixes 12bc2132b15e ("KVM: X86: Do the same ignore_msrs check for feature msrs")

please (checkpatch.pl should've complained I guess)

Quoted 11 lines
---
 arch/x86/kvm/x86.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +0 -0
index ce856e0ece84..5993fbd6d2c5 100644

arch/x86/kvm/x86.c static int kvm_msr_ignored_check(struct kvm_vcpu *vcpu, u32 msr, · line 263

Quoted 7 lines
arch/x86/kvm/x86.c +2 -2
@@ -259,8 +259,8 @@ static int kvm_msr_ignored_check(struct kvm_vcpu *vcpu, u32 msr,
 
 	if (ignore_msrs) {
 		if (report_ignored_msrs)
-			vcpu_unimpl(vcpu, "ignored %s: 0x%x data 0x%llx\n",
-				    op, msr, data);
+			kvm_pr_unimpl("ignored %s: 0x%x data 0x%llx\n",
+				      op, msr, data);

I would've preserved vcpu version for non-gloal cases, e.g.

if (report_ignored_msrs) {
	if (vcpu)
        	vcpu_unimpl(vcpu, "ignored %s: 0x%x data 0x%llx\n",
	                op, msr, data);
        else
	        kvm_pr_unimpl("ignored %s: 0x%x data 0x%llx\n",
                               op, msr, data);
}
Quoted 3 lines
arch/x86/kvm/x86.c +0 -0
 		/* Mask the error */
 		return 0;
 	} else {
Signature · 1 line
Vitaly
maintainer
#7 lore raw

Re: [PATCH 2/2] KVM: X86: Fix null pointer reference for KVM_GET_MSRS

In reply to Peter Xu
Quoted 18 lines · Peter Xu

kvm_msr_ignored_check() could trigger a null pointer reference if ignore_msrs=Y and report_ignore_msrs=Y when try to fetch an invalid feature msr using the global KVM_GET_MSRS. Degrade the error report to not rely on vcpu since that information (index, rip) is not as important as msr index/data after all.

Fixes 12bc2132b15e0a96
---
 arch/x86/kvm/x86.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +0 -0
index ce856e0ece84..5993fbd6d2c5 100644

arch/x86/kvm/x86.c static int kvm_msr_ignored_check(struct kvm_vcpu *vcpu, u32 msr, · line 266

Quoted 10 lines
arch/x86/kvm/x86.c +2 -2
@@ -259,8 +259,8 @@ static int kvm_msr_ignored_check(struct kvm_vcpu *vcpu, u32 msr,
 
 	if (ignore_msrs) {
 		if (report_ignored_msrs)
-			vcpu_unimpl(vcpu, "ignored %s: 0x%x data 0x%llx\n",
-				    op, msr, data);
+			kvm_pr_unimpl("ignored %s: 0x%x data 0x%llx\n",
+				      op, msr, data);
 		/* Mask the error */
 		return 0;
 	} else {

I committed Takashi Iwai's very similar patch. Please resend 1/2 with reviewer comments addressed, thanks!

Paolo

author
#8 lore raw

Re: [PATCH 2/2] KVM: X86: Fix null pointer reference for KVM_GET_MSRS

Quoted 6 lines · Paolo Bonzini
Quoted 6 lines
arch/x86/kvm/x86.c +0 -0
index ce856e0ece84..5993fbd6d2c5 100644
@@ -259,8 +259,8 @@ static int kvm_msr_ignored_check(struct kvm_vcpu *vcpu, u32 msr,
 
Quoted 13 lines

arch/x86/kvm/x86.c static int kvm_msr_ignored_check(struct kvm_vcpu *vcpu, u32 msr, · line 266

Quoted 10 lines
arch/x86/kvm/x86.c +2 -2
 	if (ignore_msrs) {
 		if (report_ignored_msrs)
-			vcpu_unimpl(vcpu, "ignored %s: 0x%x data 0x%llx\n",
-				    op, msr, data);
+			kvm_pr_unimpl("ignored %s: 0x%x data 0x%llx\n",
+				      op, msr, data);
 		/* Mask the error */
 		return 0;
 	} else {

I committed Takashi Iwai's very similar patch. Please resend 1/2 with reviewer comments addressed, thanks!

Sorry for a late reply (to reviewers).

Oh, how did I miss the other vcpu reference... that one is definitely better. :)

Will respin shortly on the test.

Thanks,

Signature · 1 line
Peter Xu