From: Jiri Olsa <jolsa@kernel.org> To: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Andrii Nakryiko <andriin@fb.com> Cc: "Andrii Nakryiko" <andrii@kernel.org>, netdev@vger.kernel.org, bpf@vger.kernel.org, "Martin KaFai Lau" <kafai@fb.com>, "Song Liu" <songliubraving@fb.com>, "Yonghong Song" <yhs@fb.com>, "John Fastabend" <john.fastabend@gmail.com>, "KP Singh" <kpsingh@chromium.org>, "Toke Høiland-Jørgensen" <toke@redhat.com>, "Julia Lawall" <julia.lawall@inria.fr> Subject: [PATCHv5 bpf-next 5/7] selftests/bpf: Add re-attach test to lsm test Date: Wed, 14 Apr 2021 21:51:45 +0200 [thread overview] Message-ID: <20210414195147.1624932-6-jolsa@kernel.org> (raw) In-Reply-To: <20210414195147.1624932-1-jolsa@kernel.org> Adding the test to re-attach (detach/attach again) lsm programs, plus check that already linked program can't be attached again. Acked-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- .../selftests/bpf/prog_tests/test_lsm.c | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/test_lsm.c b/tools/testing/selftests/bpf/prog_tests/test_lsm.c index 2755e4f81499..d492e76e01cf 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_lsm.c +++ b/tools/testing/selftests/bpf/prog_tests/test_lsm.c @@ -18,6 +18,8 @@ char *CMD_ARGS[] = {"true", NULL}; #define GET_PAGE_ADDR(ADDR, PAGE_SIZE) \ (char *)(((unsigned long) (ADDR + PAGE_SIZE)) & ~(PAGE_SIZE-1)) +static int duration = 0; + int stack_mprotect(void) { void *buf; @@ -51,23 +53,25 @@ int exec_cmd(int *monitored_pid) return -EINVAL; } -void test_test_lsm(void) +static int test_lsm(struct lsm *skel) { - struct lsm *skel = NULL; - int err, duration = 0; + struct bpf_link *link; int buf = 1234; - - skel = lsm__open_and_load(); - if (CHECK(!skel, "skel_load", "lsm skeleton failed\n")) - goto close_prog; + int err; err = lsm__attach(skel); if (CHECK(err, "attach", "lsm attach failed: %d\n", err)) - goto close_prog; + return err; + + /* Check that already linked program can't be attached again. */ + link = bpf_program__attach(skel->progs.test_int_hook); + if (CHECK(!IS_ERR(link), "attach_link", + "re-attach without detach should not succeed")) + return -1; err = exec_cmd(&skel->bss->monitored_pid); if (CHECK(err < 0, "exec_cmd", "err %d errno %d\n", err, errno)) - goto close_prog; + return err; CHECK(skel->bss->bprm_count != 1, "bprm_count", "bprm_count = %d\n", skel->bss->bprm_count); @@ -77,7 +81,7 @@ void test_test_lsm(void) err = stack_mprotect(); if (CHECK(errno != EPERM, "stack_mprotect", "want err=EPERM, got %d\n", errno)) - goto close_prog; + return err; CHECK(skel->bss->mprotect_count != 1, "mprotect_count", "mprotect_count = %d\n", skel->bss->mprotect_count); @@ -89,6 +93,30 @@ void test_test_lsm(void) CHECK(skel->bss->copy_test != 3, "copy_test", "copy_test = %d\n", skel->bss->copy_test); + lsm__detach(skel); + + skel->bss->copy_test = 0; + skel->bss->bprm_count = 0; + skel->bss->mprotect_count = 0; + return 0; +} + +void test_test_lsm(void) +{ + struct lsm *skel = NULL; + int err; + + skel = lsm__open_and_load(); + if (CHECK(!skel, "lsm_skel_load", "lsm skeleton failed\n")) + goto close_prog; + + err = test_lsm(skel); + if (CHECK(err, "test_lsm", "first attach failed\n")) + goto close_prog; + + err = test_lsm(skel); + CHECK(err, "test_lsm", "second attach failed\n"); + close_prog: lsm__destroy(skel); } -- 2.30.2
next prev parent reply other threads:[~2021-04-14 19:52 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-14 19:51 [PATCHv5 bpf-next 0/7] bpf: Tracing and lsm programs re-attach Jiri Olsa 2021-04-14 19:51 ` [PATCHv5 bpf-next 1/7] bpf: Allow trampoline re-attach for tracing and lsm programs Jiri Olsa 2021-04-15 23:22 ` Andrii Nakryiko 2021-04-19 22:47 ` KP Singh 2021-04-14 19:51 ` [PATCHv5 bpf-next 2/7] selftests/bpf: Add missing semicolon Jiri Olsa 2021-04-15 23:23 ` Andrii Nakryiko 2021-04-14 19:51 ` [PATCHv5 bpf-next 3/7] selftests/bpf: Add re-attach test to fentry_test Jiri Olsa 2021-04-14 19:51 ` [PATCHv5 bpf-next 4/7] selftests/bpf: Add re-attach test to fexit_test Jiri Olsa 2021-04-14 19:51 ` Jiri Olsa [this message] 2021-04-14 19:51 ` [PATCHv5 bpf-next 6/7] selftests/bpf: Test that module can't be unloaded with attached trampoline Jiri Olsa 2021-04-14 19:51 ` [PATCHv5 bpf-next 7/7] selftests/bpf: Use ASSERT macros in lsm test Jiri Olsa 2021-04-15 23:24 ` Andrii Nakryiko 2021-04-15 23:45 ` [PATCHv5 bpf-next 0/7] bpf: Tracing and lsm programs re-attach Alexei Starovoitov 2021-04-16 6:55 ` Jiri Olsa 2021-04-26 4:14 ` Alexei Starovoitov
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=20210414195147.1624932-6-jolsa@kernel.org \ --to=jolsa@kernel.org \ --cc=andrii@kernel.org \ --cc=andriin@fb.com \ --cc=ast@kernel.org \ --cc=bpf@vger.kernel.org \ --cc=daniel@iogearbox.net \ --cc=john.fastabend@gmail.com \ --cc=julia.lawall@inria.fr \ --cc=kafai@fb.com \ --cc=kpsingh@chromium.org \ --cc=netdev@vger.kernel.org \ --cc=songliubraving@fb.com \ --cc=toke@redhat.com \ --cc=yhs@fb.com \ --subject='Re: [PATCHv5 bpf-next 5/7] selftests/bpf: Add re-attach test to lsm test' \ /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
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).