Commit c5e2bf0b authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-5.14-2' of... 

Merge tag 'kvmarm-fixes-5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 5.14, take #2

- Plug race between enabling MTE and creating vcpus
- Fix off-by-one bug when checking whether an address range is RAM
parents 18712c13 c4d7c518

arch/arm64/kvm/arm.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -94,10 +94,14 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, 
		kvm->arch.return_nisv_io_abort_to_user = true;

		kvm->arch.return_nisv_io_abort_to_user = true;

		break;

		break;

	case KVM_CAP_ARM_MTE:

	case KVM_CAP_ARM_MTE:

		if (!system_supports_mte() || kvm->created_vcpus)

		mutex_lock(&kvm->lock);

			return -EINVAL;

		if (!system_supports_mte() || kvm->created_vcpus) {

			r = -EINVAL;

		} else {

			r = 0;

			r = 0;

			kvm->arch.mte_enabled = true;

			kvm->arch.mte_enabled = true;

		}

		mutex_unlock(&kvm->lock);

		break;

		break;

	default:

	default:

		r = -EINVAL;

		r = -EINVAL;

arch/arm64/kvm/hyp/nvhe/mem_protect.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -193,7 +193,7 @@ static bool range_is_memory(u64 start, u64 end) 
{

{

	struct kvm_mem_range r1, r2;

	struct kvm_mem_range r1, r2;





	if (!find_mem_range(start, &r1) || !find_mem_range(end, &r2))

	if (!find_mem_range(start, &r1) || !find_mem_range(end - 1, &r2))

		return false;

		return false;

	if (r1.start != r2.start)

	if (r1.start != r2.start)

		return false;

		return false;