[bpf-next,5/5] samples/bpf: Handle NULL pointer returned by ksym_search()

Message ID 1524101646-6544-6-git-send-email-leo.yan@linaro.org
State New
Headers show
Series
  • samples/bpf: Minor fixes and cleanup
Related show

Commit Message

Leo Yan April 19, 2018, 1:34 a.m.
This commit handles NULL pointer returned by ksym_search() to directly
print address hexadecimal value, the change is applied in 'trace_event',
'spintest' and 'offwaketime' programs.

Signed-off-by: Leo Yan <leo.yan@linaro.org>

---
 samples/bpf/offwaketime_user.c | 5 +++++
 samples/bpf/spintest_user.c    | 5 ++++-
 samples/bpf/trace_event_user.c | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

-- 
1.9.1

Patch

diff --git a/samples/bpf/offwaketime_user.c b/samples/bpf/offwaketime_user.c
index 512f87a..fce2113 100644
--- a/samples/bpf/offwaketime_user.c
+++ b/samples/bpf/offwaketime_user.c
@@ -27,6 +27,11 @@  static void print_ksym(__u64 addr)
 	if (!addr)
 		return;
 	sym = ksym_search(addr);
+	if (!sym) {
+		printf("%llx;", addr);
+		return;
+	}
+
 	if (PRINT_RAW_ADDR)
 		printf("%s/%llx;", sym->name, addr);
 	else
diff --git a/samples/bpf/spintest_user.c b/samples/bpf/spintest_user.c
index 3d73621..3140803 100644
--- a/samples/bpf/spintest_user.c
+++ b/samples/bpf/spintest_user.c
@@ -36,7 +36,10 @@  int main(int ac, char **argv)
 			bpf_map_lookup_elem(map_fd[0], &next_key, &value);
 			assert(next_key == value);
 			sym = ksym_search(value);
-			printf(" %s", sym->name);
+			if (!sym)
+				printf(" %lx", value);
+			else
+				printf(" %s", sym->name);
 			key = next_key;
 		}
 		if (key)
diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c
index 56f7a25..d2ab33e 100644
--- a/samples/bpf/trace_event_user.c
+++ b/samples/bpf/trace_event_user.c
@@ -33,6 +33,11 @@  static void print_ksym(__u64 addr)
 	if (!addr)
 		return;
 	sym = ksym_search(addr);
+	if (!sym) {
+		printf("%llx;", addr);
+		return;
+	}
+
 	printf("%s;", sym->name);
 	if (!strcmp(sym->name, "sys_read"))
 		sys_read_seen = true;