Commit 580205dd authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by Daniel Borkmann

selftests/bpf: Fix test_attach_probe

Fix two issues in test_attach_probe:

1. it was not able to parse /proc/self/maps beyond the first line,
   since %s means parse string until white space.
2. offset has to be accounted for otherwise uprobed address is incorrect.

Fixes: 1e8611bb ("selftests/bpf: add kprobe/uprobe selftests")
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20191219020442.1922617-1-ast@kernel.org
parent 12dd14b2
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "test_attach_probe.skel.h" #include "test_attach_probe.skel.h"
ssize_t get_base_addr() { ssize_t get_base_addr() {
size_t start; size_t start, offset;
char buf[256]; char buf[256];
FILE *f; FILE *f;
...@@ -11,10 +11,11 @@ ssize_t get_base_addr() { ...@@ -11,10 +11,11 @@ ssize_t get_base_addr() {
if (!f) if (!f)
return -errno; return -errno;
while (fscanf(f, "%zx-%*x %s %*s\n", &start, buf) == 2) { while (fscanf(f, "%zx-%*x %s %zx %*[^\n]\n",
&start, buf, &offset) == 3) {
if (strcmp(buf, "r-xp") == 0) { if (strcmp(buf, "r-xp") == 0) {
fclose(f); fclose(f);
return start; return start - offset;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment