Commit 2f9e10ac 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:
 "Fix unwind_frame() in the context of pseudo NMI"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: fix wrong check of on_sdei_stack in nmi context
parents 970b766c 1c418608

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;