KVM: arm64: Fix memory check in host_stage2_set_owner_locked()

misaleh · oupton · commit 3949e28786cd · 2025-05-07T00:17:05.000-07:00
I found this simple bug while preparing some patches for pKVM. AFAICT, it should be harmless (besides crashing the kernel if it was misbehaving) Fixes: e94a7de ("KVM: arm64: Move host page ownership tracking to the hyp vmemmap") Signed-off-by: Mostafa Saleh <smostafa@google.com> Link: https://lore.kernel.org/r/20250501162450.2784043-1-smostafa@google.com Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
@@ -503,7 +503,7 @@ int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id)
 {
 	int ret;
 
-	if (!addr_is_memory(addr))
+	if (!range_is_memory(addr, addr + size))
 		return -EPERM;
 
 	ret = host_stage2_try(kvm_pgtable_stage2_set_owner, &host_mmu.pgt,

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id)`
`503`	`503`	`{`
`504`	`504`	`int ret;`
`505`	`505`
`506`		`- if (!addr_is_memory(addr))`
	`506`	`+ if (!range_is_memory(addr, addr + size))`
`507`	`507`	`return -EPERM;`
`508`	`508`
`509`	`509`	`ret = host_stage2_try(kvm_pgtable_stage2_set_owner, &host_mmu.pgt,`