Skip to content

Commit 922d457

Browse files
committed
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
2 parents 9e2f649 + cbc6d44 commit 922d457

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

MAINTAINERS

+1
Original file line numberDiff line numberDiff line change
@@ -10830,6 +10830,7 @@ M: Marc Zyngier <[email protected]>
1083010830
R: James Morse <[email protected]>
1083110831
R: Alexandru Elisei <[email protected]>
1083210832
R: Suzuki K Poulose <[email protected]>
10833+
R: Oliver Upton <[email protected]>
1083310834
L: [email protected] (moderated for non-subscribers)
1083410835
L: [email protected] (moderated for non-subscribers)
1083510836
S: Maintained

arch/arm64/kvm/arm.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -2112,11 +2112,11 @@ static int finalize_hyp_mode(void)
21122112
return 0;
21132113

21142114
/*
2115-
* Exclude HYP BSS from kmemleak so that it doesn't get peeked
2116-
* at, which would end badly once the section is inaccessible.
2117-
* None of other sections should ever be introspected.
2115+
* Exclude HYP sections from kmemleak so that they don't get peeked
2116+
* at, which would end badly once inaccessible.
21182117
*/
21192118
kmemleak_free_part(__hyp_bss_start, __hyp_bss_end - __hyp_bss_start);
2119+
kmemleak_free_part(__va(hyp_mem_base), hyp_mem_size);
21202120
return pkvm_drop_host_privileges();
21212121
}
21222122

0 commit comments

Comments
 (0)