diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-06 01:36:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-06 01:36:45 +0200 |
| commit | 2f9e10acfa1243a7d0ad323873f4a193144a25c3 (patch) | |
| tree | a0a4f36b9c4d78258c7b7778f6f09bf27d9bb248 | |
| parent | Merge tag 'trace-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ro... (diff) | |
| parent | arm64: fix wrong check of on_sdei_stack in nmi context (diff) | |
| download | linux-2f9e10acfa1243a7d0ad323873f4a193144a25c3.tar.xz linux-2f9e10acfa1243a7d0ad323873f4a193144a25c3.zip | |
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
| -rw-r--r-- | arch/arm64/kernel/sdei.c | 6 |
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; |