commit b82f25782c90f91295f499e2fe185defe5ecaee5
author Quentin Perret <qperret@google.com> Mon Jul 28 16:04:34 2025 +0000
committer Quentin Perret <qperret@google.com> Mon Jul 28 16:04:34 2025 +0000
tree 9e0fa32b3f78f85cfc8cd792029a18f1c361b34d
parent ddb2f7d4723faf569c729edf8c05ba6daeee34a6

fixup! BACKPORT: ANDROID: KVM: arm64: Add a range to the guest share/unshare hypercalls

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

diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
index 5a6b2ce6..4a19724 100644
--- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c
+++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
@@ -1604,7 +1604,6 @@ int __pkvm_guest_unshare_host(u64 gfn, struct pkvm_hyp_vcpu *vcpu, u64 nr_pages,
 	ret = 0;
 	WARN_ON(host_stage2_set_owner_locked(phys, size, PKVM_ID_GUEST));
 	psci_mem_protect_inc(nr_pages);
-		goto unlock;
 	WARN_ON(kvm_pgtable_stage2_map(&vm->pgt, ipa, size, phys,
 				       pkvm_mkstate(KVM_PGTABLE_PROT_RWX, PKVM_PAGE_OWNED),
 				       &vcpu->vcpu.arch.stage2_mc, 0));