diff options
| author | Helge Deller <deller@gmx.de> | 2021-10-05 00:27:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-26 11:40:21 +0100 |
| commit | 835a7a09a3c100b5daa6229e4ca4c3c087d445a5 (patch) | |
| tree | fb47e09cc8079f4c3b7c9ab2a52f482282d263b4 /arch/parisc | |
| parent | 550156b6fbf6bdbe2db6c28aec782809d645648a (diff) | |
| download | linux-stable-835a7a09a3c100b5daa6229e4ca4c3c087d445a5.tar.gz linux-stable-835a7a09a3c100b5daa6229e4ca4c3c087d445a5.tar.bz2 linux-stable-835a7a09a3c100b5daa6229e4ca4c3c087d445a5.zip | |
parisc: Fix ptrace check on syscall return
commit 8779e05ba8aaffec1829872ef9774a71f44f6580 upstream.
The TIF_XXX flags are stored in the flags field in the thread_info
struct (TI_FLAGS), not in the flags field of the task_struct structure
(TASK_FLAGS).
It seems this bug didn't generate any important side-effects, otherwise it
wouldn't have went unnoticed for 12 years (since v2.6.32).
Signed-off-by: Helge Deller <deller@gmx.de>
Fixes: ecd3d4bc06e48 ("parisc: stop using task->ptrace for {single,block}step flags")
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 843825a7e6e2..6daad318f9be 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -1849,7 +1849,7 @@ syscall_restore: LDREG TI_TASK-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r1 /* Are we being ptraced? */ - ldw TASK_FLAGS(%r1),%r19 + LDREG TI_FLAGS-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r19 ldi _TIF_SYSCALL_TRACE_MASK,%r2 and,COND(=) %r19,%r2,%r0 b,n syscall_restore_rfi |