shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

ARM: stacktrace: don't save non kernel and module calls [2/2]

Browse Source 
PD#SWPL-101774

Problem:
save_stack_trace now record user calls

Solution:
add kernel_or_module_addr judgement before save stack

Verify:
t5w 32bit

Change-Id: Ie029f6082aa1be33924018ec655267b426054aae
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
This commit is contained in:
qiankun.wang
2022-12-01 15:06:56 +08:00
committed by Dongjin Kim
parent ff7f9cb5b5
commit 19bad2f213
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
arch/arm/kernel/stacktrace.c
View File

@@ -4,6 +4,10 @@
#include <linux/sched/debug.h>
#include <linux/stacktrace.h>
#ifdef CONFIG_AMLOGIC_ARM_KASAN
#include <linux/module.h>
#endif
#include <asm/sections.h>
#include <asm/stacktrace.h>
#include <asm/traps.h>
@@ -92,6 +96,17 @@ struct stack_trace_data {
unsigned int skip;
};
#ifdef CONFIG_AMLOGIC_ARM_KASAN
static inline bool kernel_or_module_addr(unsigned long addr)
{
if (addr >= (unsigned long)_stext && addr < (unsigned long)_end)
return true;
if (is_module_address((unsigned long)addr))
return true;
return false;
}
#endif
static int save_trace(struct stackframe *frame, void *d)
{
struct stack_trace_data *data = d;
@@ -106,7 +121,12 @@ static int save_trace(struct stackframe *frame, void *d)
return 0;
}
#ifdef CONFIG_AMLOGIC_ARM_KASAN
if (kernel_or_module_addr(addr))
trace->entries[trace->nr_entries++] = addr;
#else
trace->entries[trace->nr_entries++] = addr;
#endif
if (trace->nr_entries >= trace->max_entries)
return 1;
@@ -118,7 +138,12 @@ static int save_trace(struct stackframe *frame, void *d)
if ((unsigned long)&regs[1] > ALIGN(frame->sp, THREAD_SIZE))
return 0;
#ifdef CONFIG_AMLOGIC_ARM_KASAN
if (kernel_or_module_addr(regs->ARM_pc))
trace->entries[trace->nr_entries++] = regs->ARM_pc;
#else
trace->entries[trace->nr_entries++] = regs->ARM_pc;
#endif
return trace->nr_entries >= trace->max_entries;
}