From: John Sperbeck <jsperbeck@google.com>
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
Subject: [PATCH] objtool/x86: add missing embedded_insn check
Date: Thu, 26 Oct 2023 01:57:28 +0000 [thread overview]
Message-ID: <20231026015728.1601280-1-jsperbeck@google.com> (raw)
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. Add it back in.
Signed-off-by: John Sperbeck <jsperbeck@google.com>
---
I think 6.1.y, 5.15.y, and 5.10.y are the LTS branches missing the
bit of code that this patch re-adds.
tools/objtool/check.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index f8008ab31eef..cb363b507a32 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2478,7 +2478,7 @@ static bool is_special_call(struct instruction *insn)
if (!dest)
return false;
- if (dest->fentry)
+ if (dest->fentry || dest->embedded_insn)
return true;
}
base-commit: 7d24402875c75ca6e43aa27ae3ce2042bde259a4
--
2.42.0.758.gaed0368e0e-goog
next reply other threads:[~2023-10-26 1:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-26 1:57 John Sperbeck [this message]
2023-10-26 1:58 ` [PATCH] objtool/x86: add missing embedded_insn check kernel test robot
2023-10-26 5:17 ` Greg KH
2023-10-26 5:35 ` John Sperbeck
2023-10-26 8:17 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231026015728.1601280-1-jsperbeck@google.com \
--to=jsperbeck@google.com \
--cc=bp@alien8.de \
--cc=gregkh@linuxfoundation.org \
--cc=jpoimboe@kernel.org \
--cc=patches@lists.linux.dev \
--cc=peterz@infradead.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.