Skip to content

Commit

Permalink
KVM: arm64: Pass the actual page address to mte_clear_page_tags()
Browse files Browse the repository at this point in the history
Commit d77e59a ("arm64: mte: Lock a page for MTE tag
initialisation") added a call to mte_clear_page_tags() in case a
prior mte_copy_tags_from_user() failed in order to avoid stale tags in
the guest page (it should have really been a separate commit).
Unfortunately, the argument passed to this function was the address of
the struct page rather than the actual page address. Fix this function
call.

Fixes: d77e59a ("arm64: mte: Lock a page for MTE tag initialisation")
Signed-off-by: Catalin Marinas <[email protected]>
Cc: Marc Zyngier <[email protected]>
Reviewed-by: Oliver Upton <[email protected]>
Reviewed-by: Anshuman Khandual <[email protected]>
Reviewed-by: Cornelia Huck <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
ctmarinas authored and Marc Zyngier committed Jan 21, 2023
1 parent de535c0 commit c3b37c2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm64/kvm/guest.c
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ long kvm_vm_ioctl_mte_copy_tags(struct kvm *kvm,

/* uaccess failed, don't leave stale tags */
if (num_tags != MTE_GRANULES_PER_PAGE)
mte_clear_page_tags(page);
mte_clear_page_tags(maddr);
set_page_mte_tagged(page);

kvm_release_pfn_dirty(pfn);
Expand Down

0 comments on commit c3b37c2

Please sign in to comment.