objtool: Use offstr() to print address of missing ENDBR

jpoimboe · Peter Zijlstra · commit 1d08b92fa2c4 · 2022-04-19T21:58:50.000+02:00
Fixes: 89bc853 ("objtool: Find unused ENDBR instructions") Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/95d12e800c736a3f7d08d61dabb760b2d5251a8e.1650300597.git.jpoimboe@redhat.com
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
@@ -3211,9 +3211,8 @@ validate_ibt_reloc(struct objtool_file *file, struct reloc *reloc)
 static void warn_noendbr(const char *msg, struct section *sec, unsigned long offset,
 			 struct instruction *dest)
 {
-	WARN_FUNC("%srelocation to !ENDBR: %s+0x%lx", sec, offset, msg,
-		  dest->func ? dest->func->name : dest->sec->name,
-		  dest->func ? dest->offset - dest->func->offset : dest->offset);
+	WARN_FUNC("%srelocation to !ENDBR: %s", sec, offset, msg,
+		  offstr(dest->sec, dest->offset));
 }
 
 static void validate_ibt_dest(struct objtool_file *file, struct instruction *insn,

Original file line number	Diff line number	Diff line change
`@@ -3211,9 +3211,8 @@ validate_ibt_reloc(struct objtool_file file, struct reloc reloc)`
`3211`	`3211`	`static void warn_noendbr(const char msg, struct section sec, unsigned long offset,`
`3212`	`3212`	`struct instruction *dest)`
`3213`	`3213`	`{`
`3214`		`- WARN_FUNC("%srelocation to !ENDBR: %s+0x%lx", sec, offset, msg,`
`3215`		`- dest->func ? dest->func->name : dest->sec->name,`
`3216`		`- dest->func ? dest->offset - dest->func->offset : dest->offset);`
	`3214`	`+ WARN_FUNC("%srelocation to !ENDBR: %s", sec, offset, msg,`
	`3215`	`+ offstr(dest->sec, dest->offset));`
`3217`	`3216`	`}`
`3218`	`3217`
`3219`	`3218`	`static void validate_ibt_dest(struct objtool_file file, struct instruction insn,`