Skip to content

Commit

Permalink
Merge tag 'kvmarm-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
bonzini committed Jun 23, 2022
2 parents 9e2f649 + cbc6d44 commit 922d457
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions arch/arm64/kvm/arm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down

0 comments on commit 922d457

Please sign in to comment.