Commit 98d6651f authored Apr 01, 2019 by Wei Li Committed by Greg Kroah-Hartman May 08, 2019

arm64: fix wrong check of on_sdei_stack in nmi context



[ Upstream commit 1c41860864c8ae0387ef7d44f0000e99cbb2e06d ]

When doing unwind_frame() in the context of pseudo nmi (need enable
CONFIG_ARM64_PSEUDO_NMI), reaching the bottom of the stack (fp == 0,
pc != 0), function on_sdei_stack() will return true while the sdei acpi
table is not inited in fact. This will cause a "NULL pointer dereference"
oops when going on.

Reviewed-by: Julien Thierry <julien.thierry@arm.com>
Signed-off-by: Wei Li <liwei391@huawei.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 69da58b7

arch/arm64/kernel/sdei.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,9 @@ static bool on_sdei_normal_stack(unsigned long sp, struct stack_info *info)
		unsigned long low = (unsigned long)raw_cpu_read(sdei_stack_normal_ptr);
		unsigned long high = low + SDEI_STACK_SIZE;

		if (!low)
		return false;

		if (sp < low \|\| sp >= high)
		return false;

		@@ -111,6 +114,9 @@ static bool on_sdei_critical_stack(unsigned long sp, struct stack_info *info)
		unsigned long low = (unsigned long)raw_cpu_read(sdei_stack_critical_ptr);
		unsigned long high = low + SDEI_STACK_SIZE;

		if (!low)
		return false;

		if (sp < low \|\| sp >= high)
		return false;