summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kvm/guest.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2023-01-22 03:46:14 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2023-01-22 03:46:14 -0500
commitd732cbf78d616c0b63201eb9e5e4af3fe9b90dc4 (patch)
treec65e768d69f389a6493fdbc64826eb23e6fb6950 /arch/arm64/kvm/guest.c
parent2241ab53cbb5cdb08a6b2d4688feb13971058f65 (diff)
parentef3691683d7bfd0a2acf48812e4ffe894f10bfa8 (diff)
downloadlinux-d732cbf78d616c0b63201eb9e5e4af3fe9b90dc4.tar.bz2
Merge tag 'kvmarm-fixes-6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 6.2, take #2 - Pass the correct address to mte_clear_page_tags() on initialising a tagged page - Plug a race against a GICv4.1 doorbell interrupt while saving the vgic-v3 pending state.
Diffstat (limited to 'arch/arm64/kvm/guest.c')
-rw-r--r--arch/arm64/kvm/guest.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 5626ddb540ce..cf4c495a4321 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -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);