Skip to content

[PW_SID:1094713] riscv: stacktrace: fix stack-out-of-bounds in walk_stackframe #1933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linux-riscv-bot wants to merge 1 commit into
base: workflow__riscv__fixes
Choose a base branch
from
Open

[PW_SID:1094713] riscv: stacktrace: fix stack-out-of-bounds in walk_stackframe #1933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions arch/riscv/kernel/stacktrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,16 @@
extern asmlinkage void handle_exception(void);
extern unsigned long ret_from_exception_end;

static inline int fp_is_valid(unsigned long fp, unsigned long sp)
static inline int fp_is_valid(unsigned long fp, unsigned long sp,
struct task_struct *task)
{
unsigned long low, high;

if (!task)
task = current;

low = sp + sizeof(struct stackframe);
high = ALIGN(sp, THREAD_SIZE);
high = (unsigned long)task_stack_page(task) + THREAD_SIZE;

return !(fp < low || fp > high || fp & 0x07);
}
Expand Down Expand Up @@ -74,13 +78,13 @@ void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs,
if (unlikely(!__kernel_text_address(pc) || (level++ >= 0 && !fn(arg, pc))))
break;

if (unlikely(!fp_is_valid(fp, sp)))
if (unlikely(!fp_is_valid(fp, sp, task)))
break;

/* Unwind stack frame */
frame = (struct stackframe *)fp - 1;
sp = fp;
if (regs && (regs->epc == pc) && fp_is_valid(frame->ra, sp)) {
if (regs && (regs->epc == pc) && fp_is_valid(frame->ra, sp, task)) {
/* We hit function where ra is not saved on the stack */
fp = frame->ra;
pc = regs->ra;
Expand Down
Loading