From 29e2f1380589ac7bde7d98fdf615f0ed77dbf025 Mon Sep 17 00:00:00 2001 From: Fuad Tabba Date: Wed, 23 Feb 2022 11:01:59 +0000 Subject: [PATCH] ANDROID: KVM: arm64: get_shadow_vcpu()'s vcpu_idx should be unsigned Bug: 216808671 Signed-off-by: Fuad Tabba Change-Id: Ib6a1dfebfa21e14fbb098ef8c4e21f72ef701458 --- arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 2 +- arch/arm64/kvm/hyp/nvhe/pkvm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h index 9e9615a061aa..e4983f5cbd0f 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h +++ b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h @@ -67,7 +67,7 @@ extern phys_addr_t pvmfw_size; int __pkvm_init_shadow(struct kvm *kvm, void *shadow_va, size_t size, void *pgd); int __pkvm_teardown_shadow(int shadow_handle); -struct kvm_vcpu *get_shadow_vcpu(int shadow_handle, int vcpu_idx); +struct kvm_vcpu *get_shadow_vcpu(int shadow_handle, unsigned int vcpu_idx); void put_shadow_vcpu(struct kvm_vcpu *vcpu); u64 pvm_read_id_reg(const struct kvm_vcpu *vcpu, u32 id); diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index fb72ef154eb1..8bd9c525f201 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -257,14 +257,14 @@ static struct kvm_shadow_vm *find_shadow_by_handle(int shadow_handle) return shadow_table[shadow_index]; } -struct kvm_vcpu *get_shadow_vcpu(int shadow_handle, int vcpu_idx) +struct kvm_vcpu *get_shadow_vcpu(int shadow_handle, unsigned int vcpu_idx) { struct kvm_vcpu *vcpu = NULL; struct kvm_shadow_vm *vm; hyp_spin_lock(&shadow_lock); vm = find_shadow_by_handle(shadow_handle); - if (!vm || vcpu_idx < 0 || vm->created_vcpus <= vcpu_idx) + if (!vm || vm->created_vcpus <= vcpu_idx) goto unlock; vcpu = &vm->shadow_vcpus[vcpu_idx].vcpu;