summaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2021-10-05 00:27:49 +0200
committerHelge Deller <deller@gmx.de>2021-11-01 07:35:58 +0100
commit8779e05ba8aaffec1829872ef9774a71f44f6580 (patch)
tree634680b794cb753e4a13bc35b24637251e307e3b /arch/parisc
parent9cc2fa4f4a92ccc6760d764e7341be46ee8aaaa1 (diff)
downloadlinux-stable-8779e05ba8aaffec1829872ef9774a71f44f6580.tar.gz
linux-stable-8779e05ba8aaffec1829872ef9774a71f44f6580.tar.bz2
linux-stable-8779e05ba8aaffec1829872ef9774a71f44f6580.zip
parisc: Fix ptrace check on syscall return
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
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 4fc81eddad16..852bf7334fb5 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -1834,7 +1834,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