From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 24 Aug 2023 16:43:47 +0000 (+0200)
Subject: fix up fuzz in some 5.10 patches
X-Git-Tag: v6.1.48~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12925d01d4581970a20863b1e6885b4906beaf52;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up fuzz in some 5.10 patches

I based them against the wrong root :(
---

diff --git a/queue-5.10/x86-cpu-amd-fix-the-div-0-initial-fix-attempt.patch b/queue-5.10/x86-cpu-amd-fix-the-div-0-initial-fix-attempt.patch
index d98951b08a8..17a363ee59a 100644
--- a/queue-5.10/x86-cpu-amd-fix-the-div-0-initial-fix-attempt.patch
+++ b/queue-5.10/x86-cpu-amd-fix-the-div-0-initial-fix-attempt.patch
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/arch/x86/kernel/cpu/amd.c
 +++ b/arch/x86/kernel/cpu/amd.c
-@@ -1331,3 +1331,4 @@ void noinstr amd_clear_divider(void)
+@@ -1332,3 +1332,4 @@ void noinstr amd_clear_divider(void)
  	asm volatile(ALTERNATIVE("", "div %2\n\t", X86_BUG_DIV0)
  		     :: "a" (0), "d" (0), "r" (1));
  }
diff --git a/queue-5.10/x86-cpu-rename-srso_-.-_alias-to-srso_alias_-1.patch b/queue-5.10/x86-cpu-rename-srso_-.-_alias-to-srso_alias_-1.patch
index e1cfe0682b5..f24e360e215 100644
--- a/queue-5.10/x86-cpu-rename-srso_-.-_alias-to-srso_alias_-1.patch
+++ b/queue-5.10/x86-cpu-rename-srso_-.-_alias-to-srso_alias_-1.patch
@@ -70,12 +70,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  		*(.text.__x86.rethunk_safe)
  #endif
  		ALIGN_ENTRY_TEXT_END
-@@ -527,8 +527,8 @@ INIT_PER_CPU(irq_stack_backing_store);
-  * GNU ld cannot do XOR so do: (A | B) - (A & B) in order to compute the XOR
+@@ -533,8 +533,8 @@ INIT_PER_CPU(irq_stack_backing_store);
+  * Instead do: (A | B) - (A & B) in order to compute the XOR
   * of the two function addresses:
   */
--. = ASSERT(((srso_untrain_ret_alias | srso_safe_ret_alias) -
--		(srso_untrain_ret_alias & srso_safe_ret_alias)) == ((1 << 2) | (1 << 8) | (1 << 14) | (1 << 20)),
+-. = ASSERT(((ABSOLUTE(srso_untrain_ret_alias) | srso_safe_ret_alias) -
+-		(ABSOLUTE(srso_untrain_ret_alias) & srso_safe_ret_alias)) == ((1 << 2) | (1 << 8) | (1 << 14) | (1 << 20)),
 +. = ASSERT(((ABSOLUTE(srso_alias_untrain_ret) | srso_alias_safe_ret) -
 +		(ABSOLUTE(srso_alias_untrain_ret) & srso_alias_safe_ret)) == ((1 << 2) | (1 << 8) | (1 << 14) | (1 << 20)),
  		"SRSO function pair won't alias");