[PATCH] ftrace: Do not reference symbols in sections without size
From: Steven Rostedt
Date: Mon Feb 15 2021 - 16:45:34 EST
From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>
Starting with binutils 2.36, sections were being removed if they had weak
functions that were optimized out. Unfortunately, these weak functions would
leave references to mcount/fentry calls, that would make recordmcount fail
to find the symbol that matched the call to fentry.
Before returning the symbol of the section to create the mcount location,
check if that section size is greater than zero. If it has no size, skip
referencing that mcount call location.
Link: https://lore.kernel.org/lkml/YCafKVSTX9MxDBMd@xxxxxxxxx/
Cc: stable@xxxxxxxxxxxxxxx
[ Backport as far as it can go ]
Cc: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
Reported-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
scripts/recordmcount.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index f9b19524da11..1a29f290092d 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -562,7 +562,8 @@ static char const * __has_rel_mcount(Elf_Shdr const *const relhdr, /* reltype */
if (w(txthdr->sh_type) != SHT_PROGBITS ||
!(_w(txthdr->sh_flags) & SHF_EXECINSTR))
return NULL;
- return txtname;
+ /* If the section has no size, then it wont be available for reference */
+ return shdr0->sh_size ? txtname : NULL;
}
static char const *has_rel_mcount(Elf_Shdr const *const relhdr,
--
2.25.4