summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/sdei.c
diff options
context:
space:
mode:
authorIngo Molnar2019-04-10 09:14:42 +0200
committerIngo Molnar2019-04-10 09:14:42 +0200
commit54bbfe75cbb10384b0a62efae80fde21deea1dd0 (patch)
treeeed22c29cdecce36153bbb83ee7a9da7eed60ccd /arch/arm64/kernel/sdei.c
parentlocking/rwsem: Optimize down_read_trylock() (diff)
parentBluetooth: btusb: request wake pin with NOAUTOEN (diff)
downloadkernel-qcow2-linux-54bbfe75cbb10384b0a62efae80fde21deea1dd0.tar.gz
kernel-qcow2-linux-54bbfe75cbb10384b0a62efae80fde21deea1dd0.tar.xz
kernel-qcow2-linux-54bbfe75cbb10384b0a62efae80fde21deea1dd0.zip
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/sdei.c')
-rw-r--r--arch/arm64/kernel/sdei.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/kernel/sdei.c b/arch/arm64/kernel/sdei.c
index 5ba4465e44f0..ea94cf8f9dc6 100644
--- a/arch/arm64/kernel/sdei.c
+++ b/arch/arm64/kernel/sdei.c
@@ -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;