objtool: Treat .text.__x86.* as noinstr
commit 951ddecf435659553ed15a9214e153a3af43a9a1 upstream. Needed because zen_untrain_ret() will be called from noinstr code. Also makes sense since the thunks MUST NOT contain instrumentation nor be poked with dynamic instrumentation. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
c9eb5dcdc8
commit
c70d6f8214
@@ -366,7 +366,8 @@ static int decode_instructions(struct objtool_file *file)
|
|||||||
sec->text = true;
|
sec->text = true;
|
||||||
|
|
||||||
if (!strcmp(sec->name, ".noinstr.text") ||
|
if (!strcmp(sec->name, ".noinstr.text") ||
|
||||||
!strcmp(sec->name, ".entry.text"))
|
!strcmp(sec->name, ".entry.text") ||
|
||||||
|
!strncmp(sec->name, ".text.__x86.", 12))
|
||||||
sec->noinstr = true;
|
sec->noinstr = true;
|
||||||
|
|
||||||
for (offset = 0; offset < sec->len; offset += insn->len) {
|
for (offset = 0; offset < sec->len; offset += insn->len) {
|
||||||
|
Reference in New Issue
Block a user