kfence-use-pt_regs-to-generate-stack-trace-on-faults.patch removed from -mm tree
The patch titled
Subject: kfence: use pt_regs to generate stack trace on faults
has been removed from the -mm tree. Its filename was
kfence-use-pt_regs-to-generate-stack-trace-on-faults.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Marco Elver <[email protected]>
Subject: kfence: use pt_regs to generate stack trace on faults
Instead of removing the fault handling portion of the stack trace based on the fault handler's name, just use struct pt_regs directly.
Change kfence_handle_page_fault() to take a struct pt_regs, and plumb it through to kfence_report_error() for out-of-bounds, use-after-free, or invalid access errors, where pt_regs is used to generate the stack trace.
If the kernel is a DEBUG_KERNEL, also show registers for more information.
---
arch/arm64/include/asm/kfence.h | 2 arch/arm64/mm/fault.c | 2 arch/x86/include/asm/kfence.h | 6 -- arch/x86/mm/fault.c | 2 include/linux/kfence.h | 5 +- mm/kfence/core.c | 10 ++-- mm/kfence/kfence.h | 4 - mm/kfence/report.c | 63 +++++++++++++++++------------- 8 files changed, 48 insertions(+), 46 deletions(-)
arch/arm64/include/asm/kfence.h renamed from arch/arm64/include/asm/kfence.h~kfence-use-pt_regs-to-generate-stack-trace-on-faults +0 -2
@@ -10,8 +10,6 @@#include <asm/cacheflush.h> -#define KFENCE_SKIP_ARCH_FAULT_HANDLER "el1_sync" -static inline bool arch_kfence_init_pool (void ) {return true; }static inline bool kfence_protect_page (unsigned long addr,bool protect)
arch/arm64/mm/fault.c renamed from arch/arm64/mm/fault.c~kfence-use-pt_regs-to-generate-stack-trace-on-faults +1 -1
@@ -390,7 +390,7 @@ static void __do_kernel_fault(unsigned l }else if (addr <PAGE_SIZE ) { msg ="NULL pointer dereference" ; }else { -if (kfence_handle_page_fault (addr)) +if (kfence_handle_page_fault (addr, regs))return ; msg ="paging request" ;
arch/x86/include/asm/kfence.h renamed from arch/x86/include/asm/kfence.h~kfence-use-pt_regs-to-generate-stack-trace-on-faults +0 -6
@@ -16,12 +16,6 @@#include <asm/set_memory.h> #include <asm/tlbflush.h> -/* -* The page fault handler entry function, up to which the stack trace is -* truncated in reports. -*/ -#define KFENCE_SKIP_ARCH_FAULT_HANDLER "asm_exc_page_fault" -/* Force 4K pages for __kfence_pool. */ static inline bool arch_kfence_init_pool (void ) {
arch/x86/mm/fault.c renamed from arch/x86/mm/fault.c~kfence-use-pt_regs-to-generate-stack-trace-on-faults +1 -1
@@ -682,7 +682,7 @@ page_fault_oops(struct pt_regs *regs, unefi_crash_gracefully_on_page_fault (address);/* Only not-present faults should be handled by KFENCE. */ -if (!(error_code &X86_PF_PROT ) &&kfence_handle_page_fault (address)) +if (!(error_code &X86_PF_PROT ) &&kfence_handle_page_fault (address, regs))return ; oops:
include/linux/kfence.h renamed from include/linux/kfence.h~kfence-use-pt_regs-to-generate-stack-trace-on-faults +3 -2
@@ -186,6 +186,7 @@ static __always_inline __must_check bool/** * kfence_handle_page_fault() - perform page fault handling for KFENCE pages * @addr: faulting address +* @regs: current struct pt_regs (can be NULL, but shows full stack trace) * * Return: * * false - address outside KFENCE pool,
@@ -196,7 +197,7 @@ static __always_inline __must_check bool* cases KFENCE prints an error message and marks the offending page as * present, so that the kernel can proceed. */ -bool __must_check kfence_handle_page_fault (unsigned long addr); +bool __must_check kfence_handle_page_fault (unsigned long addr,struct pt_regs *regs);#else /* CONFIG_KFENCE */
@@ -209,7 +210,7 @@ static inline size_t kfence_ksize(conststatic inline void *kfence_object_start (const void *addr) {return NULL ; }static inline void __kfence_free (void *addr) { }static inline bool __must_check kfence_free (void *addr) {return false; } -static inline bool __must_check kfence_handle_page_fault (unsigned long addr) {return false; } +static inline bool __must_check kfence_handle_page_fault (unsigned long addr,struct pt_regs *regs) {return false; }#endif
mm/kfence/core.c renamed from mm/kfence/core.c~kfence-use-pt_regs-to-generate-stack-trace-on-faults +5 -5
@@ -216,7 +216,7 @@ static inline bool check_canary_byte(u8return true;atomic_long_inc (&counters[KFENCE_COUNTER_BUGS ]); -kfence_report_error ((unsigned long )addr,addr_to_metadata ((unsigned long )addr), +kfence_report_error ((unsigned long )addr,NULL ,addr_to_metadata ((unsigned long )addr),KFENCE_ERROR_CORRUPTION );return false; }
@@ -351,7 +351,7 @@ static void kfence_guarded_free(void *adif (meta->state !=KFENCE_OBJECT_ALLOCATED || meta->addr != (unsigned long )addr) {/* Invalid or double-free, bail out. */ atomic_long_inc (&counters[KFENCE_COUNTER_BUGS ]); -kfence_report_error ((unsigned long )addr, meta,KFENCE_ERROR_INVALID_FREE ); +kfence_report_error ((unsigned long )addr,NULL , meta,KFENCE_ERROR_INVALID_FREE );raw_spin_unlock_irqrestore (&meta->lock, flags);return ; }
@@ -766,7 +766,7 @@ void __kfence_free(void *addr)kfence_guarded_free (addr, meta, false); } -bool kfence_handle_page_fault (unsigned long addr) +bool kfence_handle_page_fault (unsigned long addr,struct pt_regs *regs) {const int page_index = (addr - (unsigned long )__kfence_pool) /PAGE_SIZE ;struct kfence_metadata *to_report =NULL ;
@@ -829,11 +829,11 @@ bool kfence_handle_page_fault(unsigned l out:if (to_report) { -kfence_report_error (addr, to_report, error_type); +kfence_report_error (addr, regs, to_report, error_type);raw_spin_unlock_irqrestore (&to_report->lock, flags); }else {/* This may be a UAF or OOB access, but we can't be sure. */ -kfence_report_error (addr,NULL ,KFENCE_ERROR_INVALID ); +kfence_report_error (addr, regs,NULL ,KFENCE_ERROR_INVALID ); }return kfence_unprotect (addr);/* Unprotect and let access proceed. */
mm/kfence/kfence.h renamed from mm/kfence/kfence.h~kfence-use-pt_regs-to-generate-stack-trace-on-faults +2 -2
@@ -105,8 +105,8 @@ enum kfence_error_type { KFENCE_ERROR_INVALID_FREE, /* Invalid free. */ }; -void kfence_report_error (unsigned long address,const struct kfence_metadata *meta, -enum kfence_error_type type); +void kfence_report_error (unsigned long address,struct pt_regs *regs, +const struct kfence_metadata *meta,enum kfence_error_type type);void kfence_print_object (struct seq_file *seq,const struct kfence_metadata *meta);
mm/kfence/report.c renamed from mm/kfence/report.c~kfence-use-pt_regs-to-generate-stack-trace-on-faults +36 -27
103 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are