Commit 922d4578 authored Jun 23, 2022 by Paolo Bonzini

Merge tag 'kvmarm-fixes-5.19-2' of...

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

parents 9e2f6498 cbc6d448

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -10830,6 +10830,7 @@ M: Marc Zyngier <maz@kernel.org>
		R: James Morse <james.morse@arm.com>
		R: Alexandru Elisei <alexandru.elisei@arm.com>
		R: Suzuki K Poulose <suzuki.poulose@arm.com>
		R: Oliver Upton <oliver.upton@linux.dev>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		L: kvmarm@lists.cs.columbia.edu (moderated for non-subscribers)
		S: Maintained

arch/arm64/kvm/arm.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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();
		}