Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71c751f2 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: add sentinel to kpti_safe_list 



We're missing a sentinel entry in kpti_safe_list. Thus is_midr_in_range_list()
can walk past the end of kpti_safe_list. Depending on the contents of memory,
this could erroneously match a CPU's MIDR, cause a data abort, or other bad
outcomes.

Add the sentinel entry to avoid this.

Fixes: be5b2998 ("arm64: capabilities: Add support for checks based on a list of MIDRs")
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reported-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Tested-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 6d08b06e

arch/arm64/kernel/cpufeature.c

+1 −0
Original line number Diff line number Diff line
@@ -868,6 +868,7 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry, 
	static const struct midr_range kpti_safe_list[] = {

		MIDR_ALL_VERSIONS(MIDR_CAVIUM_THUNDERX2),

		MIDR_ALL_VERSIONS(MIDR_BRCM_VULCAN),

		{ /* sentinel */ }

	};

	char const *str = "command line option";