diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-10 20:47:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-10 20:47:39 +0100 |
| commit | 20c7e29684bfe88bfc5f0c7bf60833116bf5e89f (patch) | |
| tree | e36e897595c8759ca6a6dd9302adcd5ccfb2ccfa /kernel | |
| parent | Merge tag '5.4-rc7-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | stacktrace: Don't skip first entry on noncurrent tasks (diff) | |
| download | linux-20c7e29684bfe88bfc5f0c7bf60833116bf5e89f.tar.xz linux-20c7e29684bfe88bfc5f0c7bf60833116bf5e89f.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull stacktrace fix from Thomas Gleixner:
"A small fix for a stacktrace regression.
Saving a stacktrace for a foreign task skipped an extra entry which
makes e.g. the output of /proc/$PID/stack incomplete"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
stacktrace: Don't skip first entry on noncurrent tasks
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/stacktrace.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c index 6d1f68b7e528..c9ea7eb2cb1a 100644 --- a/kernel/stacktrace.c +++ b/kernel/stacktrace.c @@ -141,7 +141,8 @@ unsigned int stack_trace_save_tsk(struct task_struct *tsk, unsigned long *store, struct stacktrace_cookie c = { .store = store, .size = size, - .skip = skipnr + 1, + /* skip this function if they are tracing us */ + .skip = skipnr + !!(current == tsk), }; if (!try_get_task_stack(tsk)) @@ -298,7 +299,8 @@ unsigned int stack_trace_save_tsk(struct task_struct *task, struct stack_trace trace = { .entries = store, .max_entries = size, - .skip = skipnr + 1, + /* skip this function if they are tracing us */ + .skip = skipnr + !!(current == task), }; save_stack_trace_tsk(task, &trace); |