From: Shuah Khan <skhan@linuxfoundation.org>
To: Roberto Sassu <roberto.sassu@huawei.com>,
zohar@linux.ibm.com, shuah@kernel.org, ast@kernel.org,
daniel@iogearbox.net, andrii@kernel.org, kpsingh@kernel.org,
revest@chromium.org
Cc: linux-integrity@vger.kernel.org,
linux-security-module@vger.kernel.org,
linux-kselftest@vger.kernel.org, netdev@vger.kernel.org,
bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: [PATCH v2 4/6] selftests/bpf: Add test for bpf_ima_file_hash()
Date: Tue, 15 Feb 2022 09:00:24 -0700 [thread overview]
Message-ID: <794e362d-17c0-a673-bda9-a29614221c37@linuxfoundation.org> (raw)
In-Reply-To: <20220215124042.186506-5-roberto.sassu@huawei.com>
On 2/15/22 5:40 AM, Roberto Sassu wrote:
> Modify the existing IMA test to call bpf_ima_file_hash() and update the
> expected result accordingly.
>
> Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
> ---
> .../selftests/bpf/prog_tests/test_ima.c | 29 ++++++++++++++++---
> tools/testing/selftests/bpf/progs/ima.c | 10 +++++--
> 2 files changed, 33 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/test_ima.c b/tools/testing/selftests/bpf/prog_tests/test_ima.c
> index 97d8a6f84f4a..62bf0e830453 100644
> --- a/tools/testing/selftests/bpf/prog_tests/test_ima.c
> +++ b/tools/testing/selftests/bpf/prog_tests/test_ima.c
> @@ -13,9 +13,10 @@
>
> #include "ima.skel.h"
>
> -static int run_measured_process(const char *measured_dir, u32 *monitored_pid)
> +static int run_measured_process(const char *measured_dir, u32 *monitored_pid,
> + bool *use_ima_file_hash)
> {
> - int child_pid, child_status;
> + int err, child_pid, child_status;
>
> child_pid = fork();
> if (child_pid == 0) {
> @@ -24,6 +25,21 @@ static int run_measured_process(const char *measured_dir, u32 *monitored_pid)
> NULL);
> exit(errno);
>
> + } else if (child_pid > 0) {
> + waitpid(child_pid, &child_status, 0);
> + err = WEXITSTATUS(child_status);
> + if (err)
> + return err;
> + }
> +
> + child_pid = fork();
> + if (child_pid == 0) {
> + *monitored_pid = getpid();
> + *use_ima_file_hash = true;
> + execlp("./ima_setup.sh", "./ima_setup.sh", "run", measured_dir,
> + NULL);
> + exit(errno);
> +
> } else if (child_pid > 0) {
> waitpid(child_pid, &child_status, 0);
> return WEXITSTATUS(child_status);
> @@ -72,12 +88,17 @@ void test_test_ima(void)
> if (CHECK(err, "failed to run command", "%s, errno = %d\n", cmd, errno))
> goto close_clean;
>
> - err = run_measured_process(measured_dir, &skel->bss->monitored_pid);
> + err = run_measured_process(measured_dir, &skel->bss->monitored_pid,
> + &skel->bss->use_ima_file_hash);
> if (CHECK(err, "run_measured_process", "err = %d\n", err))
> goto close_clean;
>
> err = ring_buffer__consume(ringbuf);
> - ASSERT_EQ(err, 1, "num_samples_or_err");
> + /*
> + * 1 sample with use_ima_file_hash = false
> + * 2 samples with use_ima_file_hash = true (./ima_setup.sh, /bin/true)
> + */
> + ASSERT_EQ(err, 3, "num_samples_or_err");
> ASSERT_NEQ(ima_hash_from_bpf, 0, "ima_hash");
>
> close_clean:
> diff --git a/tools/testing/selftests/bpf/progs/ima.c b/tools/testing/selftests/bpf/progs/ima.c
> index 96060ff4ffc6..9bb63f96cfc0 100644
> --- a/tools/testing/selftests/bpf/progs/ima.c
> +++ b/tools/testing/selftests/bpf/progs/ima.c
> @@ -18,6 +18,8 @@ struct {
>
> char _license[] SEC("license") = "GPL";
>
> +bool use_ima_file_hash;
> +
This can be statis.
> SEC("lsm.s/bprm_committed_creds")
> void BPF_PROG(ima, struct linux_binprm *bprm)
> {
> @@ -28,8 +30,12 @@ void BPF_PROG(ima, struct linux_binprm *bprm)
>
> pid = bpf_get_current_pid_tgid() >> 32;
> if (pid == monitored_pid) {
I also noticed monitored_pid is defined in several bpf. Potentially
could be made static. This isn't introduced in this patch though.
> - ret = bpf_ima_inode_hash(bprm->file->f_inode, &ima_hash,
> - sizeof(ima_hash));
> + if (!use_ima_file_hash)
> + ret = bpf_ima_inode_hash(bprm->file->f_inode, &ima_hash,
> + sizeof(ima_hash));
> + else
> + ret = bpf_ima_file_hash(bprm->file, &ima_hash,
> + sizeof(ima_hash));
> if (ret < 0 || ima_hash == 0)
> return;
>
>
thanks,
-- Shuah
next prev parent reply other threads:[~2022-02-15 16:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 12:40 [PATCH v2 0/6] bpf-lsm: Extend interoperability with IMA Roberto Sassu
2022-02-15 12:40 ` [PATCH v2 1/6] ima: Fix documentation-related warnings in ima_main.c Roberto Sassu
2022-02-15 15:46 ` Shuah Khan
2022-02-15 15:58 ` Roberto Sassu
2022-02-15 12:40 ` [PATCH v2 2/6] ima: Always return a file measurement in ima_file_hash() Roberto Sassu
2022-02-15 12:40 ` [PATCH v2 3/6] bpf-lsm: Introduce new helper bpf_ima_file_hash() Roberto Sassu
2022-02-15 17:02 ` Yonghong Song
2022-02-15 17:04 ` Roberto Sassu
2022-02-15 12:40 ` [PATCH v2 4/6] selftests/bpf: Add test for bpf_ima_file_hash() Roberto Sassu
2022-02-15 16:00 ` Shuah Khan [this message]
2022-02-15 12:40 ` [PATCH v2 5/6] bpf-lsm: Make bpf_lsm_kernel_read_file() as sleepable Roberto Sassu
2022-02-15 12:40 ` [PATCH v2 6/6] selftests/bpf: Add test for bpf_lsm_kernel_read_file() Roberto Sassu
2022-02-15 16:11 ` Shuah Khan
2022-02-15 16:20 ` Roberto Sassu
2022-02-18 15:01 ` [PATCH v2 0/6] bpf-lsm: Extend interoperability with IMA Roberto Sassu
2022-02-25 0:22 ` Mimi Zohar
2022-02-25 8:41 ` Roberto Sassu
2022-02-25 19:11 ` Mimi Zohar
2022-02-26 8:07 ` Greg Kroah-Hartman
2022-02-27 17:46 ` Mimi Zohar
2022-02-28 9:07 ` Roberto Sassu
2022-02-28 9:12 ` Roberto Sassu
2022-02-28 10:43 ` Greg Kroah-Hartman
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=794e362d-17c0-a673-bda9-a29614221c37@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kpsingh@kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=revest@chromium.org \
--cc=roberto.sassu@huawei.com \
--cc=shuah@kernel.org \
--cc=zohar@linux.ibm.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).