From: Greg Kroah-Hartman Date: Tue, 18 Feb 2025 15:13:18 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v6.1.129~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d461cb2856a341ae4bb61251ac7121bb53c459b;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: alpha-replace-hardcoded-stack-offsets-with-autogenerated-ones.patch --- diff --git a/queue-5.4/alpha-replace-hardcoded-stack-offsets-with-autogenerated-ones.patch b/queue-5.4/alpha-replace-hardcoded-stack-offsets-with-autogenerated-ones.patch new file mode 100644 index 0000000000..f59b39bae8 --- /dev/null +++ b/queue-5.4/alpha-replace-hardcoded-stack-offsets-with-autogenerated-ones.patch @@ -0,0 +1,49 @@ +From 77b823fa619f97d16409ca37ad4f7936e28c5f83 Mon Sep 17 00:00:00 2001 +From: Ivan Kokshaysky +Date: Tue, 4 Feb 2025 23:35:22 +0100 +Subject: alpha: replace hardcoded stack offsets with autogenerated ones + +From: Ivan Kokshaysky + +commit 77b823fa619f97d16409ca37ad4f7936e28c5f83 upstream. + +This allows the assembly in entry.S to automatically keep in sync with +changes in the stack layout (struct pt_regs and struct switch_stack). + +Cc: stable@vger.kernel.org +Tested-by: Maciej W. Rozycki +Tested-by: Matt Turner +Reviewed-by: Maciej W. Rozycki +Signed-off-by: Ivan Kokshaysky +Signed-off-by: Matt Turner +Signed-off-by: Greg Kroah-Hartman +--- + arch/alpha/kernel/asm-offsets.c | 2 ++ + arch/alpha/kernel/entry.S | 4 ---- + 2 files changed, 2 insertions(+), 4 deletions(-) + +--- a/arch/alpha/kernel/asm-offsets.c ++++ b/arch/alpha/kernel/asm-offsets.c +@@ -32,7 +32,9 @@ void foo(void) + DEFINE(CRED_EGID, offsetof(struct cred, egid)); + BLANK(); + ++ DEFINE(SP_OFF, offsetof(struct pt_regs, ps)); + DEFINE(SIZEOF_PT_REGS, sizeof(struct pt_regs)); ++ DEFINE(SWITCH_STACK_SIZE, sizeof(struct switch_stack)); + DEFINE(PT_PTRACED, PT_PTRACED); + DEFINE(CLONE_VM, CLONE_VM); + DEFINE(CLONE_UNTRACED, CLONE_UNTRACED); +--- a/arch/alpha/kernel/entry.S ++++ b/arch/alpha/kernel/entry.S +@@ -15,10 +15,6 @@ + .set noat + .cfi_sections .debug_frame + +-/* Stack offsets. */ +-#define SP_OFF 184 +-#define SWITCH_STACK_SIZE 320 +- + .macro CFI_START_OSF_FRAME func + .align 4 + .globl \func diff --git a/queue-5.4/series b/queue-5.4/series index 1e9bea7e22..87899787a7 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -202,3 +202,4 @@ arp-use-rcu-protection-in-arp_xmit.patch openvswitch-use-rcu-protection-in-ovs_vport_cmd_fill.patch ndisc-extend-rcu-protection-in-ndisc_send_skb.patch mips-fix-mips_get_syscall_arg-for-o32.patch +alpha-replace-hardcoded-stack-offsets-with-autogenerated-ones.patch