Skip to contentSkip to conversation

m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal

PATCH In review Finn Thain 2 participants 2 messages Jan 22, 2025 Stable branch

lore
Share & tools
lore

Finn Thain

author
#0 lore raw

PATCH 1/1 m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal

From: Al Viro <[email protected]>

[ Upstream commit 50e43a57334400668952f8e551c9d87d3ed2dfef ]

We get there when sigreturn has performed obscene acts on kernel stack; in particular, the location of pt_regs has shifted. We are about to call syscall_trace(), which might stop for tracer. If that happens, we'd better have task_pt_regs() returning correct result...

---
 arch/m68k/kernel/entry.S | 2 ++
 1 file changed, 2 insertions(+)
arch/m68k/kernel/entry.S +2 -0
index 417d8f0e8962..0d03b4f2077b 100644
@@ -182,6 +182,8 @@ ENTRY(ret_from_signal)
 	movel	%curptr@(TASK_STACK),%a1
 	tstb	%a1@(TINFO_FLAGS+2)
 	jge	1f
+	lea	%sp@(SWITCH_STACK_SIZE),%a1
+	movel	%a1,%curptr@(TASK_THREAD+THREAD_ESP0)
 	jbsr	syscall_trace
 1:	RESTORE_SWITCH_STACK
 	addql	#4,%sp
maintainer Tested-by Finn Thain on v1 1/1
#1 lore raw

[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: 50e43a57334400668952f8e551c9d87d3ed2dfef

WARNING: Author mismatch between patch and upstream commit:
Backport author: Finn Thain<[email protected]> Commit author: Al Viro<[email protected]>

Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (exact SHA1)
6.1.y | Present (exact SHA1)
5.15.y | Present (exact SHA1)
5.10.y | Not found
5.4.y | Not found

Note: The patch differs from the upstream commit:
---
1: 50e43a5733440 ! 1: bdb54357febe2 m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal
@@ Metadata
## Commit message ##
m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal

+ [ Upstream commit 50e43a57334400668952f8e551c9d87d3ed2dfef ]
+
We get there when sigreturn has performed obscene acts on kernel stack; in particular, the location of pt_regs has shifted. We are about to call syscall_trace(), which might stop for tracer. If that happens, we'd better
@@ Commit message

+ Signed-off-by: Finn Thain <[email protected]>

## arch/m68k/kernel/entry.S ##
@@ arch/m68k/kernel/entry.S: ENTRY(ret_from_signal)
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y        |  Success    |  Success   |