[ 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<fthain@xxxxxxxxxxxxxx>
Commit author: Al Viro<viro@xxxxxxxxxxxxxxxxxx>
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
Note: The patch differs from the upstream commit:
---
1: 50e43a5733440 ! 1: b38019d2d357f 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
Tested-by: Finn Thain <fthain@xxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/YP2dMWeV1LkHiOpr@xxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
+ Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxx>
## 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.10.y | Success | Success |
