Commit e8ab83e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fix from Catalin Marinas:
 "Add missing sentinels to the arm64 Spectre-BHB MIDR arrays, otherwise
  is_midr_in_range_list() reads beyond the end of these arrays"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: errata: Add missing sentinels to Spectre-BHB MIDR arrays
parents cbdd17b2 fee4d171

arch/arm64/kernel/proton-pack.c

+2 −0
Original line number Diff line number Diff line
@@ -879,10 +879,12 @@ static u8 spectre_bhb_loop_affected(void) 
	static const struct midr_range spectre_bhb_k132_list[] = {

		MIDR_ALL_VERSIONS(MIDR_CORTEX_X3),

		MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),

		{},

	};

	static const struct midr_range spectre_bhb_k38_list[] = {

		MIDR_ALL_VERSIONS(MIDR_CORTEX_A715),

		MIDR_ALL_VERSIONS(MIDR_CORTEX_A720),

		{},

	};

	static const struct midr_range spectre_bhb_k32_list[] = {

		MIDR_ALL_VERSIONS(MIDR_CORTEX_A78),