diff options
| author | Paolo Bonzini <[email protected]> | 2022-06-23 10:27:21 -0400 |
|---|---|---|
| committer | Paolo Bonzini <[email protected]> | 2022-06-23 10:27:21 -0400 |
| commit | 922d4578cfd017da67f545bfd07331bda86f795d (patch) | |
| tree | 39b5033fb48280d15f686acd1c0f7eb430c79e90 | |
| parent | 9e2f6498efbbc880d7caa7935839e682b64fe5a6 (diff) | |
| parent | cbc6d44867a24130ee528c20cffcbc28b3e09693 (diff) | |
Merge tag 'kvmarm-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 5.19, take #2
- Fix a regression with pKVM when kmemleak is enabled
- Add Oliver Upton as an official KVM/arm64 reviewer
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | arch/arm64/kvm/arm.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 43d3d07afccd..97014ae3e5ed 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10830,6 +10830,7 @@ M: Marc Zyngier <[email protected]> R: James Morse <[email protected]> R: Alexandru Elisei <[email protected]> R: Suzuki K Poulose <[email protected]> +R: Oliver Upton <[email protected]> L: [email protected] (moderated for non-subscribers) L: [email protected] (moderated for non-subscribers) S: Maintained diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index a0188144a122..83a7f61354d3 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -2112,11 +2112,11 @@ static int finalize_hyp_mode(void) return 0; /* - * Exclude HYP BSS from kmemleak so that it doesn't get peeked - * at, which would end badly once the section is inaccessible. - * None of other sections should ever be introspected. + * Exclude HYP sections from kmemleak so that they don't get peeked + * at, which would end badly once inaccessible. */ kmemleak_free_part(__hyp_bss_start, __hyp_bss_end - __hyp_bss_start); + kmemleak_free_part(__va(hyp_mem_base), hyp_mem_size); return pkvm_drop_host_privileges(); } |