Commit 1ca378f6 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Fix buggy-but-benign check in test_v3_new_redist_regions() 



Update 'ret' with the return value of _kvm_device_access() prior to
asserting that ret is non-zero.  In the current code base, the flaw is
benign as 'ret' is guaranteed to be -EBUSY from the previous run_vcpu(),
which also means that errno==EBUSY prior to _kvm_device_access(), thus
the "errno == EFAULT" part of the assert means that a false negative is
impossible (unless the kernel is being truly mean and spuriously setting
errno=EFAULT while returning success).

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8deb03e7

tools/testing/selftests/kvm/aarch64/vgic_init.c

+2 −2
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static void test_v3_new_redist_regions(void) 
	v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS);

	subtest_v3_redist_regions(&v);



	_kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,

	ret = _kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,

				 KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, dummy, true);

	TEST_ASSERT(ret && errno == EFAULT,

		    "register a third region allowing to cover the 4 vcpus");