Skip to contentSkip to conversation

objtool fix

GIT PULL Merged Ingo Molnar 2 participants 2 messages Jan 12, 2023 objtool

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest core/urgent git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-2023-01-12

# HEAD: cad90e5381d840cf2296aaac9b3eff71a30b7c5b objtool: Tolerate STT_NOTYPE symbols at end of section

- Fix objtool to be more permissive with hand-written assembly that uses non-function symbols in executable sections.

Thanks,

Ingo

------------------>
Nicholas Piggin (1):
objtool: Tolerate STT_NOTYPE symbols at end of section

 tools/objtool/check.c | 9 +++++++++
 1 file changed, 9 insertions(+)
tools/objtool/check.c +9 -0
index 4350be739f4f..4b7c8b33069e 100644
@@ -427,6 +427,15 @@ static int decode_instructions(struct objtool_file *file)
 			if (func->type != STT_NOTYPE && func->type != STT_FUNC)
 				continue;
 
+			if (func->offset == sec->sh.sh_size) {
+				/* Heuristic: likely an "end" symbol */
+				if (func->type == STT_NOTYPE)
+					continue;
+				WARN("%s(): STT_FUNC at end of section",
+				     func->name);
+				return -1;
+			}
+
 			if (func->return_thunk || func->alias != func)
 				continue;
 
merge bot Merged
#1 lore raw
The pull request you sent on Thu, 12 Jan 2023 14:57:17 +0100:

The pull request you sent on Thu, 12 Jan 2023 14:57:17 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-2023-01-12

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/cf4d5be89c0ad339108e672a2f973bf276bd5d2c

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html