From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Alexei Starovoitov <ast@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>,
Daniel Borkmann <daniel@iogearbox.net>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
Kernel Team <kernel-team@fb.com>
Subject: Re: [PATCH bpf-next] selftests/bpf: Fix test_attach_probe
Date: Wed, 18 Dec 2019 21:52:55 -0800 [thread overview]
Message-ID: <CAEf4BzZvUQtqXWZvBrZp_H17TDwYaU1RRAbdBqcYZJN7NAz-zA@mail.gmail.com> (raw)
In-Reply-To: <20191219020442.1922617-1-ast@kernel.org>
On Wed, Dec 18, 2019 at 6:04 PM Alexei Starovoitov <ast@kernel.org> wrote:
>
> 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: 1e8611bbdfc9 ("selftests/bpf: add kprobe/uprobe selftests")
> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
> ---
Thanks for fixing!
Acked-by: Andrii Nakryiko <andriin@fb.com>
> tools/testing/selftests/bpf/prog_tests/attach_probe.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
> index 5ed90ede2f1d..a0ee87c8e1ea 100644
> --- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c
> +++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
> @@ -3,7 +3,7 @@
> #include "test_attach_probe.skel.h"
>
> ssize_t get_base_addr() {
> - size_t start;
> + size_t start, offset;
> char buf[256];
> FILE *f;
>
> @@ -11,10 +11,11 @@ ssize_t get_base_addr() {
> if (!f)
> return -errno;
>
> - while (fscanf(f, "%zx-%*x %s %*s\n", &start, buf) == 2) {
> + while (fscanf(f, "%zx-%*x %s %zx %*[^\n]\n",
never new [^<chars>] is possible, very nice!
> + &start, buf, &offset) == 3) {
> if (strcmp(buf, "r-xp") == 0) {
> fclose(f);
> - return start;
> + return start - offset;
> }
> }
>
> --
> 2.23.0
>
next prev parent reply other threads:[~2019-12-19 5:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 2:04 [PATCH bpf-next] selftests/bpf: Fix test_attach_probe Alexei Starovoitov
2019-12-19 3:44 ` Yonghong Song
2019-12-19 5:52 ` Andrii Nakryiko [this message]
2019-12-19 16:01 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAEf4BzZvUQtqXWZvBrZp_H17TDwYaU1RRAbdBqcYZJN7NAz-zA@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).