Commit 34388d1c authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'perf-fixes-for-linus' of...

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Fix unsafe frame rewinding with hot regs fetching
parents 186837ca ab285f2b
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :) #define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :)
#endif #endif
#include <linux/uaccess.h>
extern void extern void
show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *stack, unsigned long bp, char *log_lvl); unsigned long *stack, unsigned long bp, char *log_lvl);
...@@ -42,8 +44,10 @@ static inline unsigned long rewind_frame_pointer(int n) ...@@ -42,8 +44,10 @@ static inline unsigned long rewind_frame_pointer(int n)
get_bp(frame); get_bp(frame);
#ifdef CONFIG_FRAME_POINTER #ifdef CONFIG_FRAME_POINTER
while (n--) while (n--) {
frame = frame->next_frame; if (probe_kernel_address(&frame->next_frame, frame))
break;
}
#endif #endif
return (unsigned long)frame; return (unsigned long)frame;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment