usercopy: reimplement arch_within_stack_frames
Subsystems (13)
cover usercopy: reimplement arch_within_stack_frames
From: Sahara <[email protected]>
This series of patches introduce the arm64 arch_within_stack_frames implementation using stacktrace functions. Also the base code is moved from thread_info.h to stacktrace.h. x86 code is reimplemented to use frame pointer unwinder functions.
Note: The code is still missing in case of using x86 ORC unwinder and guess unwinder.
James Morse (1):
arm64: usercopy: implement arch_within_stack_frames
Sahara (3):
stacktrace: move arch_within_stack_frames from thread_info.h
arm64: usercopy: consider dynamic array stack variable
x86: usercopy: reimplement arch_within_stack_frames with unwinder
arch/arm/kernel/stacktrace.c | 1 - arch/arm64/Kconfig | 1 + arch/arm64/kernel/stacktrace.c | 82 +++++++++++++++++++++++++++++++++++++- arch/cris/kernel/stacktrace.c | 1 - arch/metag/kernel/stacktrace.c | 2 - arch/mips/kernel/stacktrace.c | 1 - arch/sh/kernel/stacktrace.c | 1 - arch/sparc/kernel/stacktrace.c | 1 - arch/um/kernel/stacktrace.c | 1 - arch/unicore32/kernel/process.c | 1 - arch/unicore32/kernel/stacktrace.c | 2 - arch/x86/include/asm/thread_info.h | 51 +----------------------- arch/x86/include/asm/unwind.h | 5 +++ arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/stacktrace.c | 81 ++++++++++++++++++++++++++++++++++++- arch/x86/kernel/unwind_frame.c | 4 +- arch/xtensa/kernel/stacktrace.c | 1 - include/linux/page_ext.h | 1 - include/linux/stacktrace.h | 25 ++++++++++++ include/linux/thread_info.h | 21 ---------- kernel/sysctl.c | 1 - mm/usercopy.c | 2 +- 22 files changed, 196 insertions(+), 92 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/4 stacktrace: move arch_within_stack_frames from thread_info.h
From: Sahara <[email protected]>
Since the inlined arch_within_stack_frames function was placed within asm/thread_info.h, using stacktrace functions to unwind stack was restricted. Now in order to have this function use more abundant apis, it is moved to architecture's stacktrace.c. And, it is changed from inline to noinline function to clearly have three depth calls like:
do_usercopy_stack()
copy_[to|from]_user() : inline
check_copy_size() : inline
__check_object_size()
check_stack_object()
arch_within_stack_frames()
With this change, the x86's implementation was slightly changed also. And, linux/stacktrace.h includes asm/stacktrace.h from now on.
--- arch/arm/kernel/stacktrace.c | 1 - arch/arm64/kernel/stacktrace.c | 1 - arch/cris/kernel/stacktrace.c | 1 - arch/metag/kernel/stacktrace.c | 2 -- arch/mips/kernel/stacktrace.c | 1 - arch/sh/kernel/stacktrace.c | 1 - arch/sparc/kernel/stacktrace.c | 1 - arch/um/kernel/stacktrace.c | 1 - arch/unicore32/kernel/process.c | 1 - arch/unicore32/kernel/stacktrace.c | 2 -- arch/x86/include/asm/thread_info.h | 51 +------------------------------------- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/stacktrace.c | 50 ++++++++++++++++++++++++++++++++++++- arch/xtensa/kernel/stacktrace.c | 1 - include/linux/page_ext.h | 1 - include/linux/stacktrace.h | 25 +++++++++++++++++++ include/linux/thread_info.h | 21 ---------------- kernel/sysctl.c | 1 - mm/usercopy.c | 2 +- 19 files changed, 77 insertions(+), 89 deletions(-)
arch/arm/kernel/stacktrace.c +0 -1
@@ -4,7 +4,6 @@#include <linux/stacktrace.h> #include <asm/sections.h> -#include <asm/stacktrace.h> #include <asm/traps.h> #if defined(CONFIG_FRAME_POINTER ) && !defined(CONFIG_ARM_UNWIND )
arch/arm64/kernel/stacktrace.c +0 -1
@@ -25,7 +25,6 @@#include <asm/irq.h> #include <asm/stack_pointer.h> -#include <asm/stacktrace.h> /* * AArch64 PCS assigns the frame pointer to x29.
arch/cris/kernel/stacktrace.c +0 -1
@@ -1,7 +1,6 @@#include <linux/sched.h> #include <linux/sched/debug.h> #include <linux/stacktrace.h> -#include <asm/stacktrace.h> void walk_stackframe(unsigned long sp, int (*fn)(unsigned long addr, void *data),
arch/metag/kernel/stacktrace.c +0 -2
@@ -4,8 +4,6 @@#include <linux/sched/task_stack.h> #include <linux/stacktrace.h> -#include <asm/stacktrace.h> -#if defined(CONFIG_FRAME_POINTER )#ifdef CONFIG_KALLSYMS
arch/mips/kernel/stacktrace.c +0 -1
@@ -8,7 +8,6 @@#include <linux/sched/task_stack.h> #include <linux/stacktrace.h> #include <linux/export.h> -#include <asm/stacktrace.h> /* * Save stack-backtrace addresses into a stack_trace buffer:
arch/sh/kernel/stacktrace.c +0 -1
@@ -16,7 +16,6 @@#include <linux/module.h> #include <asm/unwinder.h> #include <asm/ptrace.h> -#include <asm/stacktrace.h> static int save_stack_stack (void *data,char *name) {
arch/sparc/kernel/stacktrace.c +0 -1
@@ -5,7 +5,6 @@#include <linux/ftrace.h> #include <linux/export.h> #include <asm/ptrace.h> -#include <asm/stacktrace.h> #include "kstack.h"
arch/um/kernel/stacktrace.c +0 -1
@@ -14,7 +14,6 @@#include <linux/stacktrace.h> #include <linux/module.h> #include <linux/uaccess.h> -#include <asm/stacktrace.h> void dump_trace(struct task_struct *tsk, const struct stacktrace_ops *ops,
arch/unicore32/kernel/process.c +0 -1
@@ -36,7 +36,6 @@#include <asm/cacheflush.h> #include <asm/processor.h> -#include <asm/stacktrace.h> #include "setup.h"
arch/unicore32/kernel/stacktrace.c +0 -2
@@ -14,8 +14,6 @@#include <linux/sched/debug.h> #include <linux/stacktrace.h> -#include <asm/stacktrace.h> -#if defined(CONFIG_FRAME_POINTER )/* * Unwind the current stack frame and store the new register values in the
arch/x86/include/asm/thread_info.h +1 -50
60 lines not on this page · raw message
arch/x86/kernel/Makefile +1 -1
@@ -70,7 +70,7 @@ obj-$(CONFIG_IA32_EMULATION) += tls.o obj-y += step.o obj-$(CONFIG_INTEL_TXT) += tboot.o obj-$(CONFIG_ISA_DMA_API) += i8237.o -obj-$(CONFIG_STACKTRACE) += stacktrace.o +obj-y += stacktrace.o obj-y += cpu/ obj-y += acpi/ obj-y += reboot.o
arch/x86/kernel/stacktrace.c +49 -1
61 lines not on this page · raw message
arch/xtensa/kernel/stacktrace.c +0 -1
@@ -12,7 +12,6 @@#include <linux/sched.h> #include <linux/stacktrace.h> -#include <asm/stacktrace.h> #include <asm/traps.h> #include <linux/uaccess.h>
include/linux/page_ext.h +0 -1
@@ -3,7 +3,6 @@#define __LINUX_PAGE_EXT_H#include <linux/types.h> -#include <linux/stacktrace.h> #include <linux/stackdepot.h> struct pglist_data ;
include/linux/stacktrace.h +25 -0
@@ -3,10 +3,35 @@#define __LINUX_STACKTRACE_H#include <linux/types.h> +#include <asm/stacktrace.h> struct task_struct ;struct pt_regs ; +/* +* For per-arch arch_within_stack_frames() implementations, defined in +* kernel/stacktrace.c. +*/ +enum { +BAD_STACK =-1 , +NOT_STACK =0 , +GOOD_FRAME , +GOOD_STACK , +}; + +#ifdef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES +extern int arch_within_stack_frames (const void *const stack, +const void *const stackend, +const void *obj,unsigned long len); +#else +static inline int arch_within_stack_frames (const void *const stack, +const void *const stackend, +const void *obj,unsigned long len) +{ +return NOT_STACK ; +} +#endif + #ifdef CONFIG_STACKTRACE struct stack_trace { unsigned int nr_entries, max_entries;
include/linux/thread_info.h +0 -21
@@ -23,18 +23,6 @@#endif #include <linux/bitops.h> - -/* -* For per-arch arch_within_stack_frames() implementations, defined in -* asm/thread_info.h. -*/ -enum { -BAD_STACK =-1 , -NOT_STACK =0 , -GOOD_FRAME , -GOOD_STACK , -}; -#include <asm/thread_info.h> #ifdef __KERNEL__
@@ -92,15 +80,6 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag)#define tif_need_resched () test_thread_flag(TIF_NEED_RESCHED) -#ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES -static inline int arch_within_stack_frames (const void *const stack, -const void *const stackend, -const void *obj,unsigned long len) -{ -return 0 ; -} -#endif -#ifdef CONFIG_HARDENED_USERCOPY extern void __check_object_size (const void *ptr,unsigned long n,bool to_user);
kernel/sysctl.c +0 -1
@@ -73,7 +73,6 @@#ifdef CONFIG_X86 #include <asm/nmi.h> -#include <asm/stacktrace.h> #include <asm/io.h> #endif #ifdef CONFIG_SPARC
mm/usercopy.c +1 -1
@@ -19,7 +19,7 @@#include <linux/sched.h> #include <linux/sched/task.h> #include <linux/sched/task_stack.h> -#include <linux/thread_info.h> +#include <linux/stacktrace.h> #include <asm/sections.h> /*
Signature · 1 line
2.7.4
PATCH 2/4 arm64: usercopy: implement arch_within_stack_frames
From: James Morse <[email protected]>
This implements arch_within_stack_frames() for arm64 that should validate if a given object is contained by a kernel stack frame.
--- arch/arm64/Kconfig | 1 + arch/arm64/kernel/stacktrace.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+)
arch/arm64/Kconfig +1 -0
@@ -127,6 +127,7 @@ config ARM64 select HAVE_SYSCALL_TRACEPOINTS select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_ARCH_WITHIN_STACK_FRAMES select IOMMU_DMA if IOMMU_SUPPORT select IRQ_DOMAIN select IRQ_FORCED_THREADING
arch/arm64/kernel/stacktrace.c +76 -0
88 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 3/4 arm64: usercopy: consider dynamic array stack variable
From: Sahara <[email protected]>
When an array is dynamically declared, the array may be placed at next frame. If this variable is used for usercopy, then it will cause an Oops because the current check code does not allow this exceptional case.
low -----------------------------------------------------> high [__check_object_size fp][lr][args][local vars][caller_fp][lr]
^----------------^
dynamically allocated stack variable of caller frame copies are allowed within here
< example code snippet >
array_size = get_random_int() & 0x0f;
if (to_user) {
unsigned char array[array_size];
if (copy_to_user((void __user *)user_addr, array,
unconst + sizeof(array))) {--- arch/arm64/kernel/stacktrace.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm64/kernel/stacktrace.c +6 -1
@@ -162,8 +162,13 @@ int arch_within_stack_frames(const void *stack,* Skip 4 non-inlined frames: <fake frame>, * arch_within_stack_frames(), check_stack_object() and * __check_object_size(). +* +* From Akashi's report, an object may be placed between next caller's +* frame, when the object is created as dynamic array. +* Setting the discard_frames to 3 is proper to catch this exceptional +* case. */ - arg.discard_frames =4 ; + arg.discard_frames =3 ;walk_stackframe (current, &frame, check_frame, &arg);
Signature · 1 line
2.7.4
PATCH 4/4 x86: usercopy: reimplement arch_within_stack_frames with unwinder
From: Sahara <[email protected]>
The old arch_within_stack_frames which used the frame pointer is now reimplemented to use frame pointer unwinder apis. So the main functionality is same as before.
--- arch/x86/include/asm/unwind.h | 5 +++ arch/x86/kernel/stacktrace.c | 77 +++++++++++++++++++++++++++++------------- arch/x86/kernel/unwind_frame.c | 4 +-- 3 files changed, 60 insertions(+), 26 deletions(-)
arch/x86/include/asm/unwind.h +5 -0
@@ -87,6 +87,11 @@ void unwind_init(void);void unwind_module_init (struct module *mod,void *orc_ip,size_t orc_ip_size,void *orc,size_t orc_size);#else +#ifdef CONFIG_UNWINDER_FRAME_POINTER +#define FRAME_HEADER_SIZE (sizeof(long) * 2) +size_t regs_size (struct pt_regs *regs); +#endif +static inline void unwind_init (void ) {} static inline void unwind_module_init(struct module *mod, void *orc_ip, size_t orc_ip_size,
arch/x86/kernel/stacktrace.c +54 -23
91 lines not on this page · raw message
arch/x86/kernel/unwind_frame.c +1 -3
@@ -8,8 +8,6 @@#include <asm/stacktrace.h> #include <asm/unwind.h> -#define FRAME_HEADER_SIZE (sizeof(long) * 2) -unsigned long unwind_get_return_address (struct unwind_state *state) {if (unwind_done (state))
@@ -69,7 +67,7 @@ static void unwind_dump(struct unwind_state *state) } } -static size_t regs_size (struct pt_regs *regs) +size_t regs_size (struct pt_regs *regs) {/* x86_32 regs from kernel mode are two words shorter: */ if (IS_ENABLED (CONFIG_X86_32 ) && !user_mode (regs))
Signature · 1 line
2.7.4
Re: [PATCH 4/4] x86: usercopy: reimplement arch_within_stack_frames with unwinder
Quoted 7 lines · On Thu, Mar 1, 2018 at 2:19 AM, <[email protected]> wrote:
From: Sahara <[email protected]>
The old
arch_within_stack_frameswhich used the frame pointer is now reimplemented to use frame pointer unwinder apis. So the main functionality is same as before.Signed-off-by Sahara <[email protected]>
This will result in slightly more expensive stack checking for hardened usercopy, but I think that'd be okay if this could also be made to be unwinder-agnostic. Then it would work for ORC too, and wouldn't have to depend on just FRAME_POINTER. Without that, I'm not sure what the benefit is in changing this?
Further notes below...
Quoted 34 lines
--- arch/x86/include/asm/unwind.h | 5 +++ arch/x86/kernel/stacktrace.c | 77 +++++++++++++++++++++++++++++------------- arch/x86/kernel/unwind_frame.c | 4 +-- 3 files changed, 60 insertions(+), 26 deletions(-)arch/x86/include/asm/unwind.h +5
-0@@ -87,6 +87,11 @@ void unwind_init(void);void unwind_module_init (struct module *mod,void *orc_ip,size_t orc_ip_size,void *orc,size_t orc_size);#else +#ifdef CONFIG_UNWINDER_FRAME_POINTER +#define FRAME_HEADER_SIZE (sizeof(long) * 2) +size_t regs_size (struct pt_regs *regs); +#endif +static inline void unwind_init (void ) {} static inline void unwind_module_init(struct module *mod, void *orc_ip, size_t orc_ip_size,arch/x86/kernel/stacktrace.c +4
-0@@ -12,6 +12,37 @@#include <asm/unwind.h> +static inline void *get_cur_frame (struct unwind_state *state) +{ +void *frame =NULL ; +
arch/x86/kernel/stacktrace.c line 28
Quoted 10 lines
arch/x86/kernel/stacktrace.c +10
-0+#if defined(CONFIG_UNWINDER_ORC ) +#elif defined(CONFIG_UNWINDER_FRAME_POINTER ) +if (state->regs) + frame = (void *)state->regs; +else + frame = (void *)state->bp; +#else +#endif +return frame; +}
What's going on here with the #if statement? Shouldn't this just be:
+static inline void *get_cur_frame(struct unwind_state *state) +{
+ void *frame = NULL;
+
+#ifdef CONFIG_UNWINDER_FRAME_POINTER
+ if (state->regs)
+ frame = (void *)state->regs;
+ else
+ frame = (void *)state->bp;
+#endif
+ return frame;
+}
?
Quoted 6 lines
arch/x86/kernel/stacktrace.c +6
-0+ +static inline void *get_frame_end (struct unwind_state *state) +{ +void *frame_end =NULL ; + +#if defined(CONFIG_UNWINDER_ORC )
arch/x86/kernel/stacktrace.c line 44
Quoted 10 lines
arch/x86/kernel/stacktrace.c +10
-0+#elif defined(CONFIG_UNWINDER_FRAME_POINTER ) +if (state->regs) { + frame_end = (void *)state->regs +regs_size (state->regs); + }else { + frame_end = (void *)state->bp +FRAME_HEADER_SIZE ; + } +#else +#endif +return frame_end; +}
Same thing above?
Quoted 13 lines
arch/x86/kernel/stacktrace.c +1
-5+/* * Walks up the stack frames to make sure that the specified object is * entirely contained by a single stack frame. @@ -25,31 +56,31 @@ int arch_within_stack_frames(const void * const stack,const void *const stackend, const void *obj, unsigned long len) { -#if defined(CONFIG_FRAME_POINTER) - const void *frame = NULL; -const void *oldframe; - - oldframe =__builtin_frame_address (2 );
arch/x86/kernel/stacktrace.c int arch_within_stack_frames(const void * const stack, · line 39
Quoted 10 lines
arch/x86/kernel/stacktrace.c +3
-6-if (oldframe) - frame =__builtin_frame_address (3 ); +#if defined(CONFIG_UNWINDER_FRAME_POINTER ) +struct unwind_state state; +void *prev_frame_end =NULL ;/* -* low ----------------------------------------------> high -* [saved bp][saved ip][args][local vars][saved bp][saved ip] -* ^----------------^ -* allow copies only within here
I think it's worth keeping this diagram: it explains what region is being checked...
arch/x86/kernel/stacktrace.c int arch_within_stack_frames(const void * const stack, · line 47
Quoted 11 lines
arch/x86/kernel/stacktrace.c +3
-7+* Skip 3 non-inlined frames: arch_within_stack_frames(), +* check_stack_object() and __check_object_size(). +* */ -while (stack <= frame && frame < stackend) { -/* -* If obj + len extends past the last frame, this -* check won't pass and the next frame will be 0, -* causing us to bail out and correctly report -* the copy as invalid. -*/
Also seems like we should keep the comment for describing what's happening...
Quoted 48 lines
arch/x86/kernel/stacktrace.c +17
-5-if (obj + len <= frame) -return obj >= oldframe +2 *sizeof (void *) ? -GOOD_FRAME :BAD_STACK ; - oldframe = frame; - frame = *(const void * const *)frame; +unsigned int discard_frames =3 ; + +for (unwind_start (&state, current,NULL ,NULL ); !unwind_done (&state); +unwind_next_frame (&state)) { +if (discard_frames) { + discard_frames--; + }else { +void *frame =get_cur_frame (&state); + +if (!frame || !prev_frame_end) +return NOT_STACK ; +if (obj + len <= frame) +return obj >= prev_frame_end ? +GOOD_FRAME :BAD_STACK ; + } +/* save current frame end before move to next frame */ + prev_frame_end =get_frame_end (&state); }return BAD_STACK ;#else arch/x86/kernel/unwind_frame.c +1
-4@@ -8,8 +8,6 @@#include <asm/stacktrace.h> #include <asm/unwind.h> -#define FRAME_HEADER_SIZE (sizeof(long) * 2) -unsigned long unwind_get_return_address (struct unwind_state *state) {if (unwind_done (state))@@ -69,7 +67,7 @@ static void unwind_dump(struct unwind_state *state) } } -static size_t regs_size (struct pt_regs *regs) +size_t regs_size (struct pt_regs *regs) {/* x86_32 regs from kernel mode are two words shorter: */ if (IS_ENABLED (CONFIG_X86_32 ) && !user_mode (regs)) --
Quoted 2 lines
2.7.4
-Kees
Signature · 2 lines
Kees Cook Pixel Security
Re: [PATCH 4/4] x86: usercopy: reimplement arch_within_stack_frames with unwinder
[resending with the CCs I forgot...]
Quoted 7 lines · On Thu, Mar 1, 2018 at 2:19 AM, <[email protected]> wrote:
From: Sahara <[email protected]>
The old
arch_within_stack_frameswhich used the frame pointer is now reimplemented to use frame pointer unwinder apis. So the main functionality is same as before.Signed-off-by Sahara <[email protected]>
This will result in slightly more expensive stack checking for hardened usercopy, but I think that'd be okay if this could also be made to be unwinder-agnostic. Then it would work for ORC too, and wouldn't have to depend on just FRAME_POINTER. Without that, I'm not sure what the benefit is in changing this?
Further notes below...
Quoted 34 lines
--- arch/x86/include/asm/unwind.h | 5 +++ arch/x86/kernel/stacktrace.c | 77 +++++++++++++++++++++++++++++------------- arch/x86/kernel/unwind_frame.c | 4 +-- 3 files changed, 60 insertions(+), 26 deletions(-)arch/x86/include/asm/unwind.h +5
-0@@ -87,6 +87,11 @@ void unwind_init(void);void unwind_module_init (struct module *mod,void *orc_ip,size_t orc_ip_size,void *orc,size_t orc_size);#else +#ifdef CONFIG_UNWINDER_FRAME_POINTER +#define FRAME_HEADER_SIZE (sizeof(long) * 2) +size_t regs_size (struct pt_regs *regs); +#endif +static inline void unwind_init (void ) {} static inline void unwind_module_init(struct module *mod, void *orc_ip, size_t orc_ip_size,arch/x86/kernel/stacktrace.c +4
-0@@ -12,6 +12,37 @@#include <asm/unwind.h> +static inline void *get_cur_frame (struct unwind_state *state) +{ +void *frame =NULL ; +
arch/x86/kernel/stacktrace.c line 28
Quoted 10 lines
arch/x86/kernel/stacktrace.c +10
-0+#if defined(CONFIG_UNWINDER_ORC ) +#elif defined(CONFIG_UNWINDER_FRAME_POINTER ) +if (state->regs) + frame = (void *)state->regs; +else + frame = (void *)state->bp; +#else +#endif +return frame; +}
What's going on here with the #if statement? Shouldn't this just be:
+static inline void *get_cur_frame(struct unwind_state *state) +{
+ void *frame = NULL;
+
+#ifdef CONFIG_UNWINDER_FRAME_POINTER
+ if (state->regs)
+ frame = (void *)state->regs;
+ else
+ frame = (void *)state->bp;
+#endif
+ return frame;
+}
?
Quoted 6 lines
arch/x86/kernel/stacktrace.c +6
-0+ +static inline void *get_frame_end (struct unwind_state *state) +{ +void *frame_end =NULL ; + +#if defined(CONFIG_UNWINDER_ORC )
arch/x86/kernel/stacktrace.c line 44
Quoted 10 lines
arch/x86/kernel/stacktrace.c +10
-0+#elif defined(CONFIG_UNWINDER_FRAME_POINTER ) +if (state->regs) { + frame_end = (void *)state->regs +regs_size (state->regs); + }else { + frame_end = (void *)state->bp +FRAME_HEADER_SIZE ; + } +#else +#endif +return frame_end; +}
Same thing above?
Quoted 13 lines
arch/x86/kernel/stacktrace.c +1
-5+/* * Walks up the stack frames to make sure that the specified object is * entirely contained by a single stack frame. @@ -25,31 +56,31 @@ int arch_within_stack_frames(const void * const stack,const void *const stackend, const void *obj, unsigned long len) { -#if defined(CONFIG_FRAME_POINTER) - const void *frame = NULL; -const void *oldframe; - - oldframe =__builtin_frame_address (2 );
arch/x86/kernel/stacktrace.c int arch_within_stack_frames(const void * const stack, · line 39
Quoted 10 lines
arch/x86/kernel/stacktrace.c +3
-6-if (oldframe) - frame =__builtin_frame_address (3 ); +#if defined(CONFIG_UNWINDER_FRAME_POINTER ) +struct unwind_state state; +void *prev_frame_end =NULL ;/* -* low ----------------------------------------------> high -* [saved bp][saved ip][args][local vars][saved bp][saved ip] -* ^----------------^ -* allow copies only within here
I think it's worth keeping this diagram: it explains what region is being checked...
arch/x86/kernel/stacktrace.c int arch_within_stack_frames(const void * const stack, · line 47
Quoted 11 lines
arch/x86/kernel/stacktrace.c +3
-7+* Skip 3 non-inlined frames: arch_within_stack_frames(), +* check_stack_object() and __check_object_size(). +* */ -while (stack <= frame && frame < stackend) { -/* -* If obj + len extends past the last frame, this -* check won't pass and the next frame will be 0, -* causing us to bail out and correctly report -* the copy as invalid. -*/
Also seems like we should keep the comment for describing what's happening...
Quoted 48 lines
arch/x86/kernel/stacktrace.c +17
-5-if (obj + len <= frame) -return obj >= oldframe +2 *sizeof (void *) ? -GOOD_FRAME :BAD_STACK ; - oldframe = frame; - frame = *(const void * const *)frame; +unsigned int discard_frames =3 ; + +for (unwind_start (&state, current,NULL ,NULL ); !unwind_done (&state); +unwind_next_frame (&state)) { +if (discard_frames) { + discard_frames--; + }else { +void *frame =get_cur_frame (&state); + +if (!frame || !prev_frame_end) +return NOT_STACK ; +if (obj + len <= frame) +return obj >= prev_frame_end ? +GOOD_FRAME :BAD_STACK ; + } +/* save current frame end before move to next frame */ + prev_frame_end =get_frame_end (&state); }return BAD_STACK ;#else arch/x86/kernel/unwind_frame.c +1
-4@@ -8,8 +8,6 @@#include <asm/stacktrace.h> #include <asm/unwind.h> -#define FRAME_HEADER_SIZE (sizeof(long) * 2) -unsigned long unwind_get_return_address (struct unwind_state *state) {if (unwind_done (state))@@ -69,7 +67,7 @@ static void unwind_dump(struct unwind_state *state) } } -static size_t regs_size (struct pt_regs *regs) +size_t regs_size (struct pt_regs *regs) {/* x86_32 regs from kernel mode are two words shorter: */ if (IS_ENABLED (CONFIG_X86_32 ) && !user_mode (regs)) --
Quoted 2 lines
2.7.4
-Kees
--
Kees Cook
Pixel Security
Signature · 2 lines
Kees Cook Pixel Security
Re: [PATCH 4/4] x86: usercopy: reimplement arch_within_stack_frames with unwinder
Hi Kees,
Quoted 9 lines · Kees Cook
[resending with the CCs I forgot...]
Quoted 6 lines · On Thu, Mar 1, 2018 at 2:19 AM, <[email protected]> wrote:
From: Sahara <[email protected]>
The old
arch_within_stack_frameswhich used the frame pointer is now reimplemented to use frame pointer unwinder apis. So the main functionality is same as before.
Quoted 7 lines
Quoted 1 line
Signed-off-by Sahara <[email protected]>This will result in slightly more expensive stack checking for hardened usercopy, but I think that'd be okay if this could also be made to be unwinder-agnostic. Then it would work for ORC too, and wouldn't have to depend on just
FRAME_POINTER. Without that, I'm not sure what the benefit is in changing this?
Exactly. It's the only reason not to depend on the FRAME_POINTER only. And, it will be better if it would work for ORC.
Quoted 63 lines
Further notes below...
Quoted 34 lines
--- arch/x86/include/asm/unwind.h | 5 +++ arch/x86/kernel/stacktrace.c | 77 +++++++++++++++++++++++++++++------------- arch/x86/kernel/unwind_frame.c | 4 +-- 3 files changed, 60 insertions(+), 26 deletions(-)arch/x86/include/asm/unwind.h +5
-0@@ -87,6 +87,11 @@ void unwind_init(void);void unwind_module_init (struct module *mod,void *orc_ip,size_t orc_ip_size,void *orc,size_t orc_size);#else +#ifdef CONFIG_UNWINDER_FRAME_POINTER +#define FRAME_HEADER_SIZE (sizeof(long) * 2) +size_t regs_size (struct pt_regs *regs); +#endif +static inline void unwind_init (void ) {} static inline void unwind_module_init(struct module *mod, void *orc_ip, size_t orc_ip_size,arch/x86/kernel/stacktrace.c +4
-0@@ -12,6 +12,37 @@#include <asm/unwind.h> +static inline void *get_cur_frame (struct unwind_state *state) +{ +void *frame =NULL ; +arch/x86/kernel/stacktrace.c line 28
Quoted 10 lines
arch/x86/kernel/stacktrace.c +10
-0+#if defined(CONFIG_UNWINDER_ORC ) +#elif defined(CONFIG_UNWINDER_FRAME_POINTER ) +if (state->regs) + frame = (void *)state->regs; +else + frame = (void *)state->bp; +#else +#endif +return frame; +}What's going on here with the #if statement? Shouldn't this just be:
arch/x86/kernel/stacktrace.c +12
-0+static inline void *get_cur_frame (struct unwind_state *state) +{ +void *frame =NULL ; + +#ifdef CONFIG_UNWINDER_FRAME_POINTER +if (state->regs) + frame = (void *)state->regs; +else + frame = (void *)state->bp; +#endif +return frame; +}
Quoted 1 line
?
Removed the unused #ifdef.
Quoted 11 lines
Quoted 11 lines
arch/x86/kernel/stacktrace.c +10
-0+ +static inline void *get_frame_end (struct unwind_state *state) +{ +void *frame_end =NULL ; + +#if defined(CONFIG_UNWINDER_ORC ) +#elif defined(CONFIG_UNWINDER_FRAME_POINTER ) +if (state->regs) { + frame_end = (void *)state->regs +regs_size (state->regs); + }else {
Quoted 8 lines
arch/x86/kernel/stacktrace.c line 44
Quoted 6 lines
arch/x86/kernel/stacktrace.c +6
-0+ frame_end = (void *)state->bp + FRAME_HEADER_SIZE; + } +#else +#endif +return frame_end; +}Same thing above?
Removed the unused #ifdef.
Quoted 19 lines
Quoted 19 lines
arch/x86/kernel/stacktrace.c +4
-7+/* * Walks up the stack frames to make sure that the specified object is * entirely contained by a single stack frame. @@ -25,31 +56,31 @@ int arch_within_stack_frames(const void * const stack,const void *const stackend, const void *obj, unsigned long len) { -#if defined(CONFIG_FRAME_POINTER) - const void *frame = NULL; -const void *oldframe; - - oldframe =__builtin_frame_address (2 ); -if (oldframe) - frame =__builtin_frame_address (3 ); +#if defined(CONFIG_UNWINDER_FRAME_POINTER) + struct unwind_state state; +void *prev_frame_end =NULL ;
Quoted 8 lines
arch/x86/kernel/stacktrace.c int arch_within_stack_frames(const void * const stack, · line 39
Quoted 5 lines
arch/x86/kernel/stacktrace.c +0
-4/* -* low ----------------------------------------------> high -* [saved bp][saved ip][args][local vars][saved bp][saved ip] -* ^----------------^ -* allow copies only within here I think it's worth keeping this diagram: it explains what region is being checked...
Kept the comment in v2 patch.
Quoted 13 lines
arch/x86/kernel/stacktrace.c int arch_within_stack_frames(const void * const stack, · line 47
Quoted 12 lines
arch/x86/kernel/stacktrace.c +3
-7+* Skip 3 non-inlined frames: arch_within_stack_frames(), +* check_stack_object() and __check_object_size(). +* */ -while (stack <= frame && frame < stackend) { -/* -* If obj + len extends past the last frame, this -* check won't pass and the next frame will be 0, -* causing us to bail out and correctly report -* the copy as invalid. -*/
Quoted 1 line
Also seems like we should keep the comment for describing what's happening...
Kept this comment.
Thanks.
BR,
Sahara
Quoted 62 lines
Quoted 49 lines
arch/x86/kernel/stacktrace.c +17
-5-if (obj + len <= frame) -return obj >= oldframe +2 *sizeof (void *) ? -GOOD_FRAME :BAD_STACK ; - oldframe = frame; - frame = *(const void * const *)frame; +unsigned int discard_frames =3 ; + +for (unwind_start (&state, current,NULL ,NULL ); !unwind_done (&state); +unwind_next_frame (&state)) { +if (discard_frames) { + discard_frames--; + }else { +void *frame =get_cur_frame (&state); + +if (!frame || !prev_frame_end) +return NOT_STACK ; +if (obj + len <= frame) +return obj >= prev_frame_end ? +GOOD_FRAME :BAD_STACK ; + } +/* save current frame end before move to next frame */ + prev_frame_end =get_frame_end (&state); }return BAD_STACK ;#else arch/x86/kernel/unwind_frame.c +1
-4@@ -8,8 +8,6 @@#include <asm/stacktrace.h> #include <asm/unwind.h> -#define FRAME_HEADER_SIZE (sizeof(long) * 2) -unsigned long unwind_get_return_address (struct unwind_state *state) {if (unwind_done (state))@@ -69,7 +67,7 @@ static void unwind_dump(struct unwind_state *state) } } -static size_t regs_size (struct pt_regs *regs) +size_t regs_size (struct pt_regs *regs) {/* x86_32 regs from kernel mode are two words shorter: */ if (IS_ENABLED (CONFIG_X86_32 ) && !user_mode (regs)) --Quoted 2 lines
2.7.4
-Kees
--
Kees Cook
Pixel Security--
Kees Cook
Pixel Security
Re: [PATCH 3/4] arm64: usercopy: consider dynamic array stack variable
In reply to [email protected]Quoted 13 lines · On Thu, Mar 1, 2018 at 2:19 AM, <[email protected]> wrote:
From: Sahara <[email protected]>
When an array is dynamically declared, the array may be placed at next frame. If this variable is used for usercopy, then it will cause an Oops because the current check code does not allow this exceptional case.
low -----------------------------------------------------> high [
__check_object_sizefp][lr][args][local vars][caller_fp][lr]
^----------------^
dynamically allocated stack variable of caller frame copies are allowed within here
Quoted 6 lines
< example code snippet >
array_size=get_random_int()&0x0f;if (to_user) { unsigned char array[array_size]; if (copy_to_user((void __user *)user_addr, array, unconst + sizeof(array))) {
And once we have -Wvla in the build[1] by default we can revert this and ignore the VLA case, yes?
-Kees
[1] https://lkml.org/lkml/2018/3/7/621
Quoted 28 lines
Signed-off-by Sahara <[email protected]>--- arch/arm64/kernel/stacktrace.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)arch/arm64/kernel/stacktrace.c +6
-2@@ -162,8 +162,13 @@ int arch_within_stack_frames(const void *stack,* Skip 4 non-inlined frames: <fake frame>, * arch_within_stack_frames(), check_stack_object() and * __check_object_size(). +* +* From Akashi's report, an object may be placed between next caller's +* frame, when the object is created as dynamic array. +* Setting the discard_frames to 3 is proper to catch this exceptional +* case. */ - arg.discard_frames =4 ; + arg.discard_frames =3 ;walk_stackframe (current, &frame, check_frame, &arg); --2.7.4
Signature · 2 lines
Kees Cook Pixel Security
Re: [PATCH 3/4] arm64: usercopy: consider dynamic array stack variable
Quoted 21 lines · Kees Cook
Quoted 13 lines · On Thu, Mar 1, 2018 at 2:19 AM, <[email protected]> wrote:
From: Sahara <[email protected]>
When an array is dynamically declared, the array may be placed at next frame. If this variable is used for usercopy, then it will cause an Oops because the current check code does not allow this exceptional case.
low -----------------------------------------------------> high [
__check_object_sizefp][lr][args][local vars][caller_fp][lr]
^----------------^
dynamically allocated stack variable of caller frame copies are allowed within hereQuoted 6 lines
< example code snippet >
array_size=get_random_int()&0x0f;if (to_user) { unsigned char array[array_size]; if (copy_to_user((void __user *)user_addr, array, unconst + sizeof(array))) {
Quoted 2 lines
And once we have -Wvla in the build[1] by default we can revert this and ignore the VLA case, yes?
Yes, you are right. Once we enable -Wvla, then we don't need this. Thanks.
BR,
Sahara
Quoted 41 lines
Reviewed-by Kees Cook <[email protected]>-Kees
[1] https://lkml.org/lkml/2018/3/7/621
Quoted 26 lines
Signed-off-by Sahara <[email protected]>--- arch/arm64/kernel/stacktrace.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)arch/arm64/kernel/stacktrace.c +6
-2@@ -162,8 +162,13 @@ int arch_within_stack_frames(const void *stack,* Skip 4 non-inlined frames: <fake frame>, * arch_within_stack_frames(), check_stack_object() and * __check_object_size(). +* +* From Akashi's report, an object may be placed between next caller's +* frame, when the object is created as dynamic array. +* Setting the discard_frames to 3 is proper to catch this exceptional +* case. */ - arg.discard_frames =4 ; + arg.discard_frames =3 ;walk_stackframe (current, &frame, check_frame, &arg); --Quoted 2 lines
2.7.4
--
Kees Cook
Pixel Security
Re: [PATCH 3/4] arm64: usercopy: consider dynamic array stack variable
I removed this patch from v2 patchset.
I noticed that this patch can not pass the current lkdtm stack_frame_to/from tests.
Because the bad_stack is placed before the do_usercopy_stack frame, this patch makes bad_stack pass the check.
It's not what we want to happen.
For now and later, I think this might be the best solution.
These are the each frame's information in walk_stackframe, when discard_frame is set to 3 in order to filter the variable length array.
root@genericarmv8:/sys/kernel/debug/provoke-crash# echo USERCOPY_STACK_FRAME_TO > DIRECT [ 3726.088794] lkdtm: Performing direct entry USERCOPY_STACK_FRAME_TO [ 3726.088867] lkdtm: >>> buf=0xffff00000bf7bc18 [ 3726.088936] lkdtm: >>> do_usercopy_stack_callee: fp=ffff00000bf7bbf0 xfp=ffff00000bf7bc40 [ 3726.089037] lkdtm: >>> do_usercopy_stack: good_stack=0xffff00000bf7bc98, bad_stack=0xffff00000bf7bc18 [ 3726.089129] lkdtm: >>> do_usercopy_stack: fp=ffff00000bf7bc40 xfp=ffff00000bf7bcc0 [ 3726.089203] lkdtm: attempting good copy_to_user of local stack [ 3726.089267] ===================================== [ 3726.089358] > PC = arch_within_stack_frames+0x0/0x88 [ 3726.089423] > discard_f = 3 [ 3726.089477] > frm_start = 0xffff00000bf7bb90 [ 3726.089539] > frame_end = 0xffff00000bf7bb90 [ 3726.089601] > obj start = 0xffff00000bf7bc98 [ 3726.089662] > obj end = 0xffff00000bf7bcb8 [ 3726.089720] ===================================== [ 3726.089803] > PC = check_stack_object+0x44/0x68 [ 3726.089867] > discard_f = 2 [ 3726.089921] > frm_start = 0xffff00000bf7bba0 [ 3726.089982] > frame_end = 0xffff00000bf7bbf0 [ 3726.090044] > obj start = 0xffff00000bf7bc98 [ 3726.090105] > obj end = 0xffff00000bf7bcb8 [ 3726.090163] ===================================== [ 3726.090247] > PC = __check_object_size+0x50/0x1e0 [ 3726.090311] > discard_f = 1 [ 3726.090365] > frm_start = 0xffff00000bf7bc00 [ 3726.090427] > frame_end = 0xffff00000bf7bc00 [ 3726.090489] > obj start = 0xffff00000bf7bc98 [ 3726.090550] > obj end = 0xffff00000bf7bcb8 [ 3726.090608] ===================================== [ 3726.090688] > PC = do_usercopy_stack+0x188/0x3c0 [ 3726.090752] > discard_f = 0 [ 3726.090806] > frm_start = 0xffff00000bf7bc10 [ 3726.090867] > frame_end = 0xffff00000bf7bc40 [ 3726.091025] > obj start = 0xffff00000bf7bc98 [ 3726.091134] > obj end = 0xffff00000bf7bcb8 [ 3726.091240] ===================================== [ 3726.091365] > PC = lkdtm_USERCOPY_STACK_FRAME_TO+0x24/0x38 [ 3726.091495] > discard_f = 0 [ 3726.091596] > frm_start = 0xffff00000bf7bc50 [ 3726.091702] > frame_end = 0xffff00000bf7bcc0 [ 3726.091806] > obj start = 0xffff00000bf7bc98 [ 3726.091909] > obj end = 0xffff00000bf7bcb8 [ 3726.092037] lkdtm: attempting bad copy_to_user of distant stack [ 3726.092163] ===================================== [ 3726.092298] > PC = arch_within_stack_frames+0x0/0x88 [ 3726.092424] > discard_f = 3 [ 3726.092528] > frm_start = 0xffff00000bf7bb90 [ 3726.092634] > frame_end = 0xffff00000bf7bb90 [ 3726.092696] > obj start = 0xffff00000bf7bc18 [ 3726.092757] > obj end = 0xffff00000bf7bc38 [ 3726.092815] ===================================== [ 3726.092897] > PC = check_stack_object+0x44/0x68 [ 3726.092960] > discard_f = 2 [ 3726.093014] > frm_start = 0xffff00000bf7bba0 [ 3726.093075] > frame_end = 0xffff00000bf7bbf0 [ 3726.093136] > obj start = 0xffff00000bf7bc18 [ 3726.093198] > obj end = 0xffff00000bf7bc38 [ 3726.093255] ===================================== [ 3726.093338] > PC = __check_object_size+0x50/0x1e0 [ 3726.093402] > discard_f = 1 [ 3726.093456] > frm_start = 0xffff00000bf7bc00 [ 3726.093517] > frame_end = 0xffff00000bf7bc00 [ 3726.093578] > obj start = 0xffff00000bf7bc18 [ 3726.093640] > obj end = 0xffff00000bf7bc38 [ 3726.093697] ===================================== [ 3726.093777] > PC = do_usercopy_stack+0x318/0x3c0 [ 3726.093840] > discard_f = 0 [ 3726.093894] > frm_start = 0xffff00000bf7bc10 [ 3726.093955] > frame_end = 0xffff00000bf7bc40 [ 3726.094016] > obj start = 0xffff00000bf7bc18 [ 3726.094077] > obj end = 0xffff00000bf7bc38
Thanks.
BR
Sahara
Quoted 73 lines · Keun-O Park
Quoted 21 lines · Kees Cook
Quoted 13 lines · On Thu, Mar 1, 2018 at 2:19 AM, <[email protected]> wrote:
From: Sahara <[email protected]>
When an array is dynamically declared, the array may be placed at next frame. If this variable is used for usercopy, then it will cause an Oops because the current check code does not allow this exceptional case.
low -----------------------------------------------------> high [
__check_object_sizefp][lr][args][local vars][caller_fp][lr]
^----------------^
dynamically allocated stack variable of caller frame copies are allowed within hereQuoted 6 lines
< example code snippet >
array_size=get_random_int()&0x0f;if (to_user) { unsigned char array[array_size]; if (copy_to_user((void __user *)user_addr, array, unconst + sizeof(array))) {Quoted 2 lines
And once we have -Wvla in the build[1] by default we can revert this and ignore the VLA case, yes?
Yes, you are right. Once we enable -Wvla, then we don't need this. Thanks.
BR,
SaharaQuoted 41 lines
Reviewed-by Kees Cook <[email protected]>-Kees
[1] https://lkml.org/lkml/2018/3/7/621
Quoted 26 lines
Signed-off-by Sahara <[email protected]>--- arch/arm64/kernel/stacktrace.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)arch/arm64/kernel/stacktrace.c +6
-2@@ -162,8 +162,13 @@ int arch_within_stack_frames(const void *stack,* Skip 4 non-inlined frames: <fake frame>, * arch_within_stack_frames(), check_stack_object() and * __check_object_size(). +* +* From Akashi's report, an object may be placed between next caller's +* frame, when the object is created as dynamic array. +* Setting the discard_frames to 3 is proper to catch this exceptional +* case. */ - arg.discard_frames =4 ; + arg.discard_frames =3 ;walk_stackframe (current, &frame, check_frame, &arg); --Quoted 2 lines
2.7.4
--
Kees Cook
Pixel Security
Re: [PATCH 2/4] arm64: usercopy: implement arch_within_stack_frames
In reply to [email protected]Quoted 7 lines · On Thu, Mar 1, 2018 at 2:19 AM, <[email protected]> wrote:
From: James Morse <[email protected]>
This implements
arch_within_stack_frames()for arm64 that should validate if a given object is contained by a kernel stack frame.Signed-off-by James Morse <[email protected]>Reviewed-by Sahara <[email protected]>
Looks good to me. Does this end up passing the LKDTM USERCOPY_STACK_FRAME_TO and USERCOPY_STACK_FRAME_FROM tests?
-Kees
Quoted 114 lines
--- arch/arm64/Kconfig | 1 + arch/arm64/kernel/stacktrace.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+)arch/arm64/Kconfig +1
-0@@ -127,6 +127,7 @@ config ARM64 select HAVE_SYSCALL_TRACEPOINTS select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_ARCH_WITHIN_STACK_FRAMES select IOMMU_DMA if IOMMU_SUPPORT select IRQ_DOMAIN select IRQ_FORCED_THREADINGarch/arm64/kernel/stacktrace.c +76
-1@@ -26,6 +26,11 @@#include <asm/irq.h> #include <asm/stack_pointer.h> +#define FAKE_FRAME (frame, my_func) do { \ + frame.fp = (unsigned long)__builtin_frame_address(0); \ + frame.pc = (unsigned long)my_func; \ +} while (0) +/* * AArch64 PCS assigns the frame pointer to x29. * @@ -94,6 +99,77 @@ void notrace walk_stackframe(struct task_struct *tsk, struct stackframe *frame, } } +struct check_frame_arg { +unsigned long obj_start; +unsigned long obj_end; +unsigned long frame_start; +int discard_frames; +int err; +}; + +static int check_frame (struct stackframe *frame,void *d) +{ +struct check_frame_arg *arg = d; +unsigned long frame_end = frame->fp; + +/* object overlaps multiple frames */ +if (arg->obj_start < frame->fp && frame->fp < arg->obj_end) { + arg->err =BAD_STACK ; +return 1 ; + } + +/* +* Discard frames and check object is in a frame written early +* enough. +*/ +if (arg->discard_frames) + arg->discard_frames--; +else if ((arg->frame_start <= arg->obj_start && + arg->obj_start < frame_end) && + (arg->frame_start < arg->obj_end && arg->obj_end <= frame_end)) +return 1 ; + +/* object exists in a previous frame */ +if (arg->obj_end < arg->frame_start) { + arg->err =BAD_STACK ; +return 1 ; + } + + arg->frame_start = frame_end +0x10 ; + +return 0 ; +} + +/* Check obj doesn't overlap a stack frame record */ +int arch_within_stack_frames (const void *stack, +const void *stack_end, +const void *obj,unsigned long obj_len) +{ +struct stackframe frame; +struct check_frame_arg arg; + +if (!IS_ENABLED (CONFIG_FRAME_POINTER )) +return NOT_STACK ; + + arg.err =GOOD_FRAME ; + arg.obj_start = (unsigned long )obj; + arg.obj_end = arg.obj_start + obj_len; + +FAKE_FRAME (frame, arch_within_stack_frames); + arg.frame_start = frame.fp; + +/* +* Skip 4 non-inlined frames: <fake frame>, +* arch_within_stack_frames(), check_stack_object() and +* __check_object_size(). +*/ + arg.discard_frames =4 ; + +walk_stackframe (current, &frame, check_frame, &arg); + +return arg.err; +} + #ifdef CONFIG_STACKTRACE struct stack_trace_data { struct stack_trace *trace; --2.7.4
Signature · 2 lines
Kees Cook Pixel Security
Re: [PATCH 2/4] arm64: usercopy: implement arch_within_stack_frames
Hi Kees,
Quoted 11 lines · Kees Cook
Quoted 7 lines · On Thu, Mar 1, 2018 at 2:19 AM, <[email protected]> wrote:
From: James Morse <[email protected]>
This implements
arch_within_stack_frames()for arm64 that should validate if a given object is contained by a kernel stack frame.Signed-off-by James Morse <[email protected]>Reviewed-by Sahara <[email protected]>Looks good to me. Does this end up passing the LKDTM
USERCOPY_STACK_FRAME_TOandUSERCOPY_STACK_FRAME_FROMtests?
Yes, this passes those two LKDTM tests.
Thanks.
BR
Sahara
Re: [PATCH 1/4] stacktrace: move arch_within_stack_frames from thread_info.h
In reply to [email protected]Quoted 15 lines · On Thu, Mar 1, 2018 at 2:19 AM, <[email protected]> wrote:
From: Sahara <[email protected]>
Since the inlined
arch_within_stack_framesfunction was placed withinasm/thread_info.h, using stacktrace functions to unwind stack was restricted. Now in order to have this function use more abundant apis, it is moved to architecture'sstacktrace.c. And, it is changed from inline to noinline function to clearly have three depth calls like:
do_usercopy_stack()
copy_[to|from]_user() : inline
check_copy_size(): inline
__check_object_size()
check_stack_object()
arch_within_stack_frames()
Quoted 4 lines
With this change, the x86's implementation was slightly changed also. And,
linux/stacktrace.hincludesasm/stacktrace.hfrom now on.Signed-off-by Sahara <[email protected]>
This seems like a good clean-up regardless of anything else. :)
I think x86 folks, especially Josh Poimboeuf and Ingo Molnar, and LKML should be included in CC for follow-up versions of this series, since it touches the x86 stuff too.
-Kees
Quoted 420 lines
--- arch/arm/kernel/stacktrace.c | 1 - arch/arm64/kernel/stacktrace.c | 1 - arch/cris/kernel/stacktrace.c | 1 - arch/metag/kernel/stacktrace.c | 2 -- arch/mips/kernel/stacktrace.c | 1 - arch/sh/kernel/stacktrace.c | 1 - arch/sparc/kernel/stacktrace.c | 1 - arch/um/kernel/stacktrace.c | 1 - arch/unicore32/kernel/process.c | 1 - arch/unicore32/kernel/stacktrace.c | 2 -- arch/x86/include/asm/thread_info.h | 51 +------------------------------------- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/stacktrace.c | 50 ++++++++++++++++++++++++++++++++++++- arch/xtensa/kernel/stacktrace.c | 1 - include/linux/page_ext.h | 1 - include/linux/stacktrace.h | 25 +++++++++++++++++++ include/linux/thread_info.h | 21 ---------------- kernel/sysctl.c | 1 - mm/usercopy.c | 2 +- 19 files changed, 77 insertions(+), 89 deletions(-)arch/arm/kernel/stacktrace.c +0
-1@@ -4,7 +4,6 @@#include <linux/stacktrace.h> #include <asm/sections.h> -#include <asm/stacktrace.h> #include <asm/traps.h> #if defined(CONFIG_FRAME_POINTER ) && !defined(CONFIG_ARM_UNWIND )arch/arm64/kernel/stacktrace.c +0
-1@@ -25,7 +25,6 @@#include <asm/irq.h> #include <asm/stack_pointer.h> -#include <asm/stacktrace.h> /* * AArch64 PCS assigns the frame pointer to x29. arch/cris/kernel/stacktrace.c +0
-1@@ -1,7 +1,6 @@#include <linux/sched.h> #include <linux/sched/debug.h> #include <linux/stacktrace.h> -#include <asm/stacktrace.h> void walk_stackframe(unsigned long sp, int (*fn)(unsigned long addr, void *data),arch/metag/kernel/stacktrace.c +0
-2@@ -4,8 +4,6 @@#include <linux/sched/task_stack.h> #include <linux/stacktrace.h> -#include <asm/stacktrace.h> -#if defined(CONFIG_FRAME_POINTER )#ifdef CONFIG_KALLSYMS arch/mips/kernel/stacktrace.c +0
-1@@ -8,7 +8,6 @@#include <linux/sched/task_stack.h> #include <linux/stacktrace.h> #include <linux/export.h> -#include <asm/stacktrace.h> /* * Save stack-backtrace addresses into a stack_trace buffer: arch/sh/kernel/stacktrace.c +0
-1@@ -16,7 +16,6 @@#include <linux/module.h> #include <asm/unwinder.h> #include <asm/ptrace.h> -#include <asm/stacktrace.h> static int save_stack_stack (void *data,char *name) {arch/sparc/kernel/stacktrace.c +0
-1@@ -5,7 +5,6 @@#include <linux/ftrace.h> #include <linux/export.h> #include <asm/ptrace.h> -#include <asm/stacktrace.h> #include "kstack.h" arch/um/kernel/stacktrace.c +0
-1@@ -14,7 +14,6 @@#include <linux/stacktrace.h> #include <linux/module.h> #include <linux/uaccess.h> -#include <asm/stacktrace.h> void dump_trace(struct task_struct *tsk, const struct stacktrace_ops *ops,arch/unicore32/kernel/process.c +0
-1@@ -36,7 +36,6 @@#include <asm/cacheflush.h> #include <asm/processor.h> -#include <asm/stacktrace.h> #include "setup.h" arch/unicore32/kernel/stacktrace.c +0
-2@@ -14,8 +14,6 @@#include <linux/sched/debug.h> #include <linux/stacktrace.h> -#include <asm/stacktrace.h> -#if defined(CONFIG_FRAME_POINTER )/* * Unwind the current stack frame and store the new register values in the arch/x86/include/asm/thread_info.h +1
-50@@ -156,59 +156,10 @@ struct thread_info {* * preempt_count needs to be 1 initially, until the scheduler is functional. */ -#ifndef __ASSEMBLY__ - -/* -* Walks up the stack frames to make sure that the specified object is -* entirely contained by a single stack frame. -* -* Returns: -* GOOD_FRAME if within a frame -* BAD_STACK if placed across a frame boundary (or outside stack) -* NOT_STACK unable to determine (no frame pointers, etc) -*/ -static inline int arch_within_stack_frames (const void *const stack, -const void *const stackend, -const void *obj,unsigned long len) -{ -#if defined(CONFIG_FRAME_POINTER ) -const void *frame =NULL ; -const void *oldframe; - - oldframe =__builtin_frame_address (1 ); -if (oldframe) - frame =__builtin_frame_address (2 ); -/* -* low ----------------------------------------------> high -* [saved bp][saved ip][args][local vars][saved bp][saved ip] -* ^----------------^ -* allow copies only within here -*/ -while (stack <= frame && frame < stackend) { -/* -* If obj + len extends past the last frame, this -* check won't pass and the next frame will be 0, -* causing us to bail out and correctly report -* the copy as invalid. -*/ -if (obj + len <= frame) -return obj >= oldframe +2 *sizeof (void *) ? -GOOD_FRAME :BAD_STACK ; - oldframe = frame; - frame = *(const void *const *)frame; - } -return BAD_STACK ; -#else -return NOT_STACK ; -#endif -} - -#else /* !__ASSEMBLY__ */ - +#ifdef __ASSEMBLY__#ifdef CONFIG_X86_64 # define cpu_current_top_of_stack (cpu_tss_rw + TSS_sp1)#endif -#endif #ifdef CONFIG_COMPAT arch/x86/kernel/Makefile +1
-1@@ -70,7 +70,7 @@ obj-$(CONFIG_IA32_EMULATION) += tls.o obj-y += step.o obj-$(CONFIG_INTEL_TXT) += tboot.o obj-$(CONFIG_ISA_DMA_API) += i8237.o -obj-$(CONFIG_STACKTRACE) += stacktrace.o +obj-y += stacktrace.o obj-y += cpu/ obj-y += acpi/ obj-y += reboot.oarch/x86/kernel/stacktrace.c +49
-1@@ -9,9 +9,56 @@#include <linux/stacktrace.h> #include <linux/export.h> #include <linux/uaccess.h> -#include <asm/stacktrace.h> #include <asm/unwind.h> + +/* +* Walks up the stack frames to make sure that the specified object is +* entirely contained by a single stack frame. +* +* Returns: +* GOOD_FRAME if within a frame +* BAD_STACK if placed across a frame boundary (or outside stack) +* NOT_STACK unable to determine (no frame pointers, etc) +*/ +int arch_within_stack_frames (const void *const stack, +const void *const stackend, +const void *obj,unsigned long len) +{ +#if defined(CONFIG_FRAME_POINTER ) +const void *frame =NULL ; +const void *oldframe; + + oldframe =__builtin_frame_address (2 ); +if (oldframe) + frame =__builtin_frame_address (3 ); +/* +* low ----------------------------------------------> high +* [saved bp][saved ip][args][local vars][saved bp][saved ip] +* ^----------------^ +* allow copies only within here +*/ +while (stack <= frame && frame < stackend) { +/* +* If obj + len extends past the last frame, this +* check won't pass and the next frame will be 0, +* causing us to bail out and correctly report +* the copy as invalid. +*/ +if (obj + len <= frame) +return obj >= oldframe +2 *sizeof (void *) ? +GOOD_FRAME :BAD_STACK ; + oldframe = frame; + frame = *(const void *const *)frame; + } +return BAD_STACK ; +#else +return NOT_STACK ; +#endif +} + +#ifdef CONFIG_STACKTRACE +static int save_stack_address (struct stack_trace *trace,unsigned long addr,bool nosched) {@@ -241,3 +288,4 @@ void save_stack_trace_user(struct stack_trace *trace)if (trace->nr_entries < trace->max_entries) trace->entries[trace->nr_entries++] = ULONG_MAX; } +#endif /* CONFIG_STACKTRACE */ arch/xtensa/kernel/stacktrace.c +0
-1@@ -12,7 +12,6 @@#include <linux/sched.h> #include <linux/stacktrace.h> -#include <asm/stacktrace.h> #include <asm/traps.h> #include <linux/uaccess.h> include/linux/page_ext.h +0
-1@@ -3,7 +3,6 @@#define __LINUX_PAGE_EXT_H#include <linux/types.h> -#include <linux/stacktrace.h> #include <linux/stackdepot.h> struct pglist_data ;include/linux/stacktrace.h +25
-0@@ -3,10 +3,35 @@#define __LINUX_STACKTRACE_H#include <linux/types.h> +#include <asm/stacktrace.h> struct task_struct ;struct pt_regs ; +/* +* For per-arch arch_within_stack_frames() implementations, defined in +* kernel/stacktrace.c. +*/ +enum { +BAD_STACK =-1 , +NOT_STACK =0 , +GOOD_FRAME , +GOOD_STACK , +}; + +#ifdef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES +extern int arch_within_stack_frames (const void *const stack, +const void *const stackend, +const void *obj,unsigned long len); +#else +static inline int arch_within_stack_frames (const void *const stack, +const void *const stackend, +const void *obj,unsigned long len) +{ +return NOT_STACK ; +} +#endif + #ifdef CONFIG_STACKTRACE struct stack_trace { unsigned int nr_entries, max_entries;include/linux/thread_info.h +0
-21@@ -23,18 +23,6 @@#endif #include <linux/bitops.h> - -/* -* For per-arch arch_within_stack_frames() implementations, defined in -* asm/thread_info.h. -*/ -enum { -BAD_STACK =-1 , -NOT_STACK =0 , -GOOD_FRAME , -GOOD_STACK , -}; -#include <asm/thread_info.h> #ifdef __KERNEL__@@ -92,15 +80,6 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag)#define tif_need_resched () test_thread_flag(TIF_NEED_RESCHED) -#ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES -static inline int arch_within_stack_frames (const void *const stack, -const void *const stackend, -const void *obj,unsigned long len) -{ -return 0 ; -} -#endif -#ifdef CONFIG_HARDENED_USERCOPY extern void __check_object_size (const void *ptr,unsigned long n,bool to_user);kernel/sysctl.c +0
-1@@ -73,7 +73,6 @@#ifdef CONFIG_X86 #include <asm/nmi.h> -#include <asm/stacktrace.h> #include <asm/io.h> #endif #ifdef CONFIG_SPARC mm/usercopy.c +1
-2@@ -19,7 +19,7 @@#include <linux/sched.h> #include <linux/sched/task.h> #include <linux/sched/task_stack.h> -#include <linux/thread_info.h> +#include <linux/stacktrace.h> #include <asm/sections.h> /* -- 2.7.4
Signature · 2 lines
Kees Cook Pixel Security
Hi Sahara,
Quoted 6 lines · On Thu, Mar 01, 2018 at 02:19:47PM +0400, [email protected] wrote:
From: Sahara <[email protected]>
This series of patches introduce the arm64
arch_within_stack_framesimplementation using stacktrace functions. Also the base code is moved fromthread_info.htostacktrace.h. x86 code is reimplemented to use frame pointer unwinder functions.
What's the status on this series? I'm ok taking the arm64 patch from James to bring us up to speed with x86, but it doesn't make sense without the first patch in the series because the arch callback is out-of-line.
Will
Hi Will,
Quoted 10 lines · Will Deacon
Hi Sahara,
Quoted 6 lines · On Thu, Mar 01, 2018 at 02:19:47PM +0400, [email protected] wrote:
From: Sahara <[email protected]>
This series of patches introduce the arm64
arch_within_stack_framesimplementation using stacktrace functions. Also the base code is moved fromthread_info.htostacktrace.h. x86 code is reimplemented to use frame pointer unwinder functions.
Quoted 5 lines
What's the status on this series? I'm ok taking the arm64 patch from James to bring us up to speed with x86, but it doesn't make sense without the first patch in the series because the arch callback is out-of-line.
Will
I haven't received any response from Kees or other engineers about this series of patches yet.
Hi Kees, any comment on these patches to put these on the next stage? Thanks.
BR
Sahara
Quoted 17 lines · Keun-O Park
Hi Will,
Quoted 14 lines · Will Deacon
Hi Sahara,
Quoted 6 lines · On Thu, Mar 01, 2018 at 02:19:47PM +0400, [email protected] wrote:
From: Sahara <[email protected]>
This series of patches introduce the arm64
arch_within_stack_framesimplementation using stacktrace functions. Also the base code is moved fromthread_info.htostacktrace.h. x86 code is reimplemented to use frame pointer unwinder functions.What's the status on this series? I'm ok taking the arm64 patch from James to bring us up to speed with x86, but it doesn't make sense without the first patch in the series because the arch callback is out-of-line.
Quoted 5 lines
Quoted 1 line
Will
I haven't received any response from Kees or other engineers about this series of patches yet.
Hi Kees, any comment on these patches to put these on the next stage?
Hi! Sorry for the delay, I'll send some notes now...
-Kees
Signature · 2 lines
Kees Cook Pixel Security