| Message ID | 20210811173630.2536721-1-qperret@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: arm64: Return -EPERM from __pkvm_host_share_hyp() | expand |
On Wed, 11 Aug 2021 18:36:25 +0100, Quentin Perret wrote: > Fix the error code returned by __pkvm_host_share_hyp() when the > host attempts to share with EL2 a page that has already been shared with > another entity. Applied to next, thanks! [1/1] KVM: arm64: Return -EPERM from __pkvm_host_share_hyp() commit: 12593568d7319c34c72038ea799ab1bd0f0eb01c Cheers, M.
diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 8165390d3ec9..6ec695311498 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -404,7 +404,7 @@ int __pkvm_host_share_hyp(u64 pfn) cur = kvm_pgtable_hyp_pte_prot(pte); prot = pkvm_mkstate(PAGE_HYP, PKVM_PAGE_SHARED_BORROWED); if (!check_prot(cur, prot, ~prot)) - ret = EPERM; + ret = -EPERM; goto unlock; map_shared:
Fix the error code returned by __pkvm_host_share_hyp() when the host attempts to share with EL2 a page that has already been shared with another entity. Reported-by: Will Deacon <will@kernel.org> Signed-off-by: Quentin Perret <qperret@google.com> --- This patch fixes a bug introduced in the stage-2 ownership series which is already queued in kvmarm/next: https://lore.kernel.org/lkml/20210809152448.1810400-1-qperret@google.com/ I've starred at this code for hours, but that clearly was not enough. Oh well ... --- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)