diff options
| author |  Paolo Bonzini <pbonzini@redhat.com>
| 2024-02-16 12:02:38 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com>
| 2024-02-16 12:02:38 -0500 |
| commit | 9895ceeb5cd61092f147f8d611e2df575879dd6f (patch) | |
| tree | 179404588c2a9d0571f22884d39e1f6f6788ecea | |
| parent | Merge tag 'kvmarm-fixes-6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | KVM: arm64: Fix double-free following kvm_pgtable_stage2_free_unlinked() (diff) | |
| download | linux-9895ceeb5cd61092f147f8d611e2df575879dd6f.tar.gz linux-9895ceeb5cd61092f147f8d611e2df575879dd6f.tar.bz2 linux-9895ceeb5cd61092f147f8d611e2df575879dd6f.zip | |
Merge tag 'kvmarm-fixes-6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 6.8, take #2
- Avoid dropping the page refcount twice when freeing an unlinked
page-table subtree.
| -rw-r--r-- | arch/arm64/kvm/hyp/pgtable.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index c651df904fe3..ab9d05fcf98b 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -1419,7 +1419,6 @@ kvm_pte_t *kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, level + 1); if (ret) { kvm_pgtable_stage2_free_unlinked(mm_ops, pgtable, level); - mm_ops->put_page(pgtable); return ERR_PTR(ret); } @@ -1502,7 +1501,6 @@ static int stage2_split_walker(const struct kvm_pgtable_visit_ctx *ctx, if (!stage2_try_break_pte(ctx, mmu)) { kvm_pgtable_stage2_free_unlinked(mm_ops, childp, level); - mm_ops->put_page(childp); return -EAGAIN; } |