提交 5c7be8fc 编写于 作者: A Andy Lutomirski 提交者: Xie XiuQi

x86/dumpstack: Fix off-by-one errors in stack identification

mainline inclusion
from mainline-5.2-rc1
commit fa33215422fd
category: bugfix
bugzilla: NA
CVE: NA

-------------------------------------------------

The get_stack_info() function is off-by-one when checking whether an
address is on a IRQ stack or a IST stack. This prevents an overflowed
IRQ or IST stack from being dumped properly.

[ tglx: Do the same for 32-bit ]
Signed-off-by: NAndy Lutomirski <luto@kernel.org>
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NBorislav Petkov <bp@suse.de>
Reviewed-by: NSean Christopherson <sean.j.christopherson@intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190414160143.785651055@linutronix.deSigned-off-by: NCheng Jian <cj.chengjian@huawei.com>
Reviewed-by: NXuefeng Wang <wxf.wang@hisilicon.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 c5c2b86d
...@@ -41,7 +41,7 @@ static bool in_hardirq_stack(unsigned long *stack, struct stack_info *info) ...@@ -41,7 +41,7 @@ static bool in_hardirq_stack(unsigned long *stack, struct stack_info *info)
* This is a software stack, so 'end' can be a valid stack pointer. * This is a software stack, so 'end' can be a valid stack pointer.
* It just means the stack is empty. * It just means the stack is empty.
*/ */
if (stack <= begin || stack > end) if (stack < begin || stack > end)
return false; return false;
info->type = STACK_TYPE_IRQ; info->type = STACK_TYPE_IRQ;
...@@ -66,7 +66,7 @@ static bool in_softirq_stack(unsigned long *stack, struct stack_info *info) ...@@ -66,7 +66,7 @@ static bool in_softirq_stack(unsigned long *stack, struct stack_info *info)
* This is a software stack, so 'end' can be a valid stack pointer. * This is a software stack, so 'end' can be a valid stack pointer.
* It just means the stack is empty. * It just means the stack is empty.
*/ */
if (stack <= begin || stack > end) if (stack < begin || stack > end)
return false; return false;
info->type = STACK_TYPE_SOFTIRQ; info->type = STACK_TYPE_SOFTIRQ;
......
...@@ -65,7 +65,7 @@ static bool in_exception_stack(unsigned long *stack, struct stack_info *info) ...@@ -65,7 +65,7 @@ static bool in_exception_stack(unsigned long *stack, struct stack_info *info)
begin = end - (exception_stack_sizes[k] / sizeof(long)); begin = end - (exception_stack_sizes[k] / sizeof(long));
regs = (struct pt_regs *)end - 1; regs = (struct pt_regs *)end - 1;
if (stack <= begin || stack >= end) if (stack < begin || stack >= end)
continue; continue;
info->type = STACK_TYPE_EXCEPTION + k; info->type = STACK_TYPE_EXCEPTION + k;
...@@ -88,7 +88,7 @@ static bool in_irq_stack(unsigned long *stack, struct stack_info *info) ...@@ -88,7 +88,7 @@ static bool in_irq_stack(unsigned long *stack, struct stack_info *info)
* This is a software stack, so 'end' can be a valid stack pointer. * This is a software stack, so 'end' can be a valid stack pointer.
* It just means the stack is empty. * It just means the stack is empty.
*/ */
if (stack <= begin || stack > end) if (stack < begin || stack >= end)
return false; return false;
info->type = STACK_TYPE_IRQ; info->type = STACK_TYPE_IRQ;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册