bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] btf_encoder: Add extra checks for symbol names
@ 2021-01-12 18:40 Jiri Olsa
  2021-01-12 19:20 ` Andrii Nakryiko
  2021-01-13  0:27 ` Tom Stellard
  0 siblings, 2 replies; 26+ messages in thread
From: Jiri Olsa @ 2021-01-12 18:40 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: dwarves, bpf, Alexei Starovoitov, Andrii Nakryiko, Yonghong Song,
	Hao Luo, Sedat Dilek, Tom Stellard

When processing kernel image build by clang we can
find some functions without the name, which causes
pahole to segfault.

Adding extra checks to make sure we always have
function's name defined before using it.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 btf_encoder.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/btf_encoder.c b/btf_encoder.c
index 333973054b61..17f7a14f2ef0 100644
--- a/btf_encoder.c
+++ b/btf_encoder.c
@@ -72,6 +72,8 @@ static int collect_function(struct btf_elf *btfe, GElf_Sym *sym)
 
 	if (elf_sym__type(sym) != STT_FUNC)
 		return 0;
+	if (!elf_sym__name(sym, btfe->symtab))
+		return 0;
 
 	if (functions_cnt == functions_alloc) {
 		functions_alloc = max(1000, functions_alloc * 3 / 2);
@@ -730,9 +732,11 @@ int cu__encode_btf(struct cu *cu, int verbose, bool force,
 		if (!has_arg_names(cu, &fn->proto))
 			continue;
 		if (functions_cnt) {
-			struct elf_function *func;
+			const char *name = function__name(fn, cu);
+			struct elf_function *func = NULL;
 
-			func = find_function(btfe, function__name(fn, cu));
+			if (name)
+				func = find_function(btfe, name);
 			if (!func || func->generated)
 				continue;
 			func->generated = true;
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2021-02-04  6:41 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-12 18:40 [PATCH] btf_encoder: Add extra checks for symbol names Jiri Olsa
2021-01-12 19:20 ` Andrii Nakryiko
2021-01-12 19:47   ` Jiri Olsa
2021-01-12 20:17     ` Sedat Dilek
2021-01-13  0:27 ` Tom Stellard
2021-01-14  7:50   ` Sedat Dilek
2021-01-14 14:33     ` Tom Stellard
2021-01-14 14:39       ` Sedat Dilek
2021-01-21 13:38   ` Arnaldo Carvalho de Melo
2021-01-21 16:06     ` Sedat Dilek
2021-01-21 19:37       ` Arnaldo Carvalho de Melo
2021-01-21 20:53       ` Andrii Nakryiko
2021-01-22  2:07         ` Sedat Dilek
2021-01-22  4:11           ` Andrii Nakryiko
2021-01-28 20:00             ` [RFT] pahole 1.20 RC was " Arnaldo Carvalho de Melo
2021-01-28 20:57               ` Sedat Dilek
2021-01-28 21:11                 ` Arnaldo Carvalho de Melo
2021-01-28 22:28                   ` Sedat Dilek
2021-02-02  7:48               ` Andrii Nakryiko
2021-02-03  9:03                 ` Sedat Dilek
2021-02-03 10:23                   ` Mark Wielaard
2021-02-03 21:48                     ` Sedat Dilek
2021-02-03 23:21                       ` Andrii Nakryiko
2021-02-04  1:06                         ` Arnaldo Carvalho de Melo
2021-02-04  6:40                         ` Sedat Dilek
2021-01-21 17:37     ` Tom Stellard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).