From: Song Liu <songliubraving@fb.com>
To: KP Singh <kpsingh@chromium.org>
Cc: open list <linux-kernel@vger.kernel.org>,
bpf <bpf@vger.kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>, Martin Lau <kafai@fb.com>,
Paul Turner <pjt@google.com>, Jann Horn <jannh@google.com>,
Hao Luo <haoluo@google.com>
Subject: Re: [PATCH bpf-next v2 8/8] bpf: Exercise syscall operations for inode and sk storage
Date: Tue, 3 Nov 2020 22:32:22 +0000 [thread overview]
Message-ID: <87AD7DC4-63DD-4DE2-B035-A3FA2D708601@fb.com> (raw)
In-Reply-To: <20201103153132.2717326-9-kpsingh@chromium.org>
> On Nov 3, 2020, at 7:31 AM, KP Singh <kpsingh@chromium.org> wrote:
>
> From: KP Singh <kpsingh@google.com>
A short commit log would be great...
>
> Signed-off-by: KP Singh <kpsingh@google.com>
> ---
> .../bpf/prog_tests/test_local_storage.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/test_local_storage.c b/tools/testing/selftests/bpf/prog_tests/test_local_storage.c
> index feba23f8848b..2e64baabb50d 100644
> --- a/tools/testing/selftests/bpf/prog_tests/test_local_storage.c
> +++ b/tools/testing/selftests/bpf/prog_tests/test_local_storage.c
> @@ -145,7 +145,7 @@ bool check_syscall_operations(int map_fd, int obj_fd)
> void test_test_local_storage(void)
> {
> char tmp_exec_path[PATH_MAX] = "/tmp/copy_of_rmXXXXXX";
> - int err, serv_sk = -1, task_fd = -1;
> + int err, serv_sk = -1, task_fd = -1, rm_fd = -1;
> struct local_storage *skel = NULL;
>
> skel = local_storage__open_and_load();
> @@ -169,6 +169,15 @@ void test_test_local_storage(void)
> if (CHECK(err < 0, "copy_rm", "err %d errno %d\n", err, errno))
> goto close_prog;
>
> + rm_fd = open(tmp_exec_path, O_RDONLY);
> + if (CHECK(rm_fd < 0, "open", "failed to open %s err:%d, errno:%d",
> + tmp_exec_path, rm_fd, errno))
> + goto close_prog;
> +
> + if (!check_syscall_operations(bpf_map__fd(skel->maps.inode_storage_map),
> + rm_fd))
> + goto close_prog;
> +
> /* Sets skel->bss->monitored_pid to the pid of the forked child
> * forks a child process that executes tmp_exec_path and tries to
> * unlink its executable. This operation should be denied by the loaded
> @@ -197,9 +206,14 @@ void test_test_local_storage(void)
> CHECK(skel->data->sk_storage_result != 0, "sk_storage_result",
> "sk_local_storage not set\n");
>
> + if (!check_syscall_operations(bpf_map__fd(skel->maps.sk_storage_map),
> + serv_sk))
> + goto close_prog;
We shouldn't need this goto, otherwise we may leak serv_sk.
> +
> close(serv_sk);
>
> close_prog:
> + close(rm_fd);
> close(task_fd);
> local_storage__destroy(skel);
> }
> --
> 2.29.1.341.ge80a0c044ae-goog
>
next prev parent reply other threads:[~2020-11-03 22:32 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 15:31 [PATCH bpf-next v2 0/8] Implement task_local_storage KP Singh
2020-11-03 15:31 ` [PATCH bpf-next v2 1/8] bpf: Implement task local storage KP Singh
2020-11-03 23:47 ` Song Liu
2020-11-03 23:54 ` KP Singh
2020-11-03 15:31 ` [PATCH bpf-next v2 2/8] libbpf: Add support for " KP Singh
2020-11-03 19:28 ` Andrii Nakryiko
2020-11-03 20:28 ` KP Singh
2020-11-03 15:31 ` [PATCH bpf-next v2 3/8] bpftool: " KP Singh
2020-11-03 23:50 ` Song Liu
2020-11-03 15:31 ` [PATCH bpf-next v2 4/8] bpf: Implement get_current_task_btf and RET_PTR_TO_BTF_ID KP Singh
2020-11-03 23:57 ` Song Liu
2020-11-03 15:31 ` [PATCH bpf-next v2 5/8] bpf: Fix tests for local_storage KP Singh
2020-11-04 0:16 ` Song Liu
2020-11-03 15:31 ` [PATCH bpf-next v2 6/8] bpf: Update selftests for local_storage to use vmlinux.h KP Singh
2020-11-04 0:16 ` Song Liu
2020-11-03 15:31 ` [PATCH bpf-next v2 7/8] bpf: Add tests for task_local_storage KP Singh
2020-11-03 18:47 ` Alexei Starovoitov
2020-11-03 18:59 ` KP Singh
2020-11-04 0:05 ` KP Singh
2020-11-04 1:27 ` Alexei Starovoitov
2020-11-04 1:55 ` KP Singh
2020-11-04 1:57 ` Alexei Starovoitov
2020-11-04 6:51 ` John Fastabend
2020-11-04 11:03 ` KP Singh
2020-11-04 11:11 ` KP Singh
2020-11-03 15:31 ` [PATCH bpf-next v2 8/8] bpf: Exercise syscall operations for inode and sk storage KP Singh
2020-11-03 22:32 ` Song Liu [this message]
2020-11-03 22:58 ` KP Singh
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=87AD7DC4-63DD-4DE2-B035-A3FA2D708601@fb.com \
--to=songliubraving@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=jannh@google.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pjt@google.com \
/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).