6.1-stable patches

added patches:
	objtool-x86-add-missing-embedded_insn-check.patch

diff --git a/queue-6.1/objtool-x86-add-missing-embedded_insn-check.patch b/queue-6.1/objtool-x86-add-missing-embedded_insn-check.patch
new file mode 100644 (file)
index 0000000..d0f5d17
--- /dev/null
+++ b/queue-6.1/objtool-x86-add-missing-embedded_insn-check.patch
@@ -0,0 +1,40 @@
+From jsperbeck@google.com  Tue Oct 31 15:13:57 2023
+From: John Sperbeck <jsperbeck@google.com>
+Date: Sat, 28 Oct 2023 18:41:31 +0000
+Subject: objtool/x86: add missing embedded_insn check
+To: gregkh@linuxfoundation.org
+Cc: bp@alien8.de, jpoimboe@kernel.org, patches@lists.linux.dev, peterz@infradead.org, stable@vger.kernel.org, jsperbeck@google.com
+Message-ID: <20231028184131.2103810-1-jsperbeck@google.com>
+
+From: John Sperbeck <jsperbeck@google.com>
+
+When dbf460087755 ("objtool/x86: Fixup frame-pointer vs rethunk")
+was backported to some stable branches, the check for dest->embedded_insn
+in is_special_call() was missed.  The result is that the warning it
+was intended to suppress still appears.  For example on 6.1 (on kernels
+before 6.1, the '-s' argument would instead be 'check'):
+
+$ tools/objtool/objtool -s arch/x86/lib/retpoline.o
+arch/x86/lib/retpoline.o: warning: objtool: srso_untrain_ret+0xd:
+    call without frame pointer save/setup
+
+With this patch, the warning is correctly suppressed, and the
+kernel still passes the normal Google kernel developer tests.
+
+Signed-off-by: John Sperbeck <jsperbeck@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/objtool/check.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/objtool/check.c
++++ b/tools/objtool/check.c
+@@ -2478,7 +2478,7 @@ static bool is_special_call(struct instr
+               if (!dest)
+                       return false;
+ 
+-              if (dest->fentry)
++              if (dest->fentry || dest->embedded_insn)
+                       return true;
+       }
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index a3523a43a6e04ed7c4044abfbf17bad869e54527..cb1ea5a859a706457902a4d03fe630af4517821a 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -83,3 +83,4 @@ platform-x86-add-s2idle-quirk-for-more-lenovo-laptops.patch
 ext4-add-two-helper-functions-extent_logical_end-and-pa_logical_end.patch
 ext4-fix-bug-in-ext4_mb_new_inode_pa-due-to-overflow.patch
 ext4-avoid-overlapping-preallocations-due-to-overflow.patch
+objtool-x86-add-missing-embedded_insn-check.patch