From: Roberto Sassu <roberto.sassu@huaweicloud.com>
To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
martin.lau@linux.dev, song@kernel.org, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org, mykolal@fb.com,
dhowells@redhat.com, jarkko@kernel.org, rostedt@goodmis.org,
mingo@redhat.com, paul@paul-moore.com, jmorris@namei.org,
serge@hallyn.com, shuah@kernel.org
Cc: bpf@vger.kernel.org, keyrings@vger.kernel.org,
linux-security-module@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
deso@posteo.net, memxor@gmail.com,
Roberto Sassu <roberto.sassu@huawei.com>
Subject: [PATCH v14 12/12] selftests/bpf: Add verifier tests for dynamic pointers parameters in kfuncs
Date: Tue, 30 Aug 2022 18:17:16 +0200 [thread overview]
Message-ID: <20220830161716.754078-13-roberto.sassu@huaweicloud.com> (raw)
In-Reply-To: <20220830161716.754078-1-roberto.sassu@huaweicloud.com>
From: Roberto Sassu <roberto.sassu@huawei.com>
Add verifier tests to ensure that only supported dynamic pointer types are
accepted, that the passed argument is actually a dynamic pointer, and that
the passed argument is a pointer to the stack.
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
---
.../bpf/verifier/kfunc_dynptr_param.c | 72 +++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 tools/testing/selftests/bpf/verifier/kfunc_dynptr_param.c
diff --git a/tools/testing/selftests/bpf/verifier/kfunc_dynptr_param.c b/tools/testing/selftests/bpf/verifier/kfunc_dynptr_param.c
new file mode 100644
index 000000000000..8abb8d566321
--- /dev/null
+++ b/tools/testing/selftests/bpf/verifier/kfunc_dynptr_param.c
@@ -0,0 +1,72 @@
+{
+ "kfunc dynamic pointer param: type not supported",
+ .insns = {
+ BPF_ST_MEM(BPF_DW, BPF_REG_10, -16, 0),
+ BPF_MOV64_REG(BPF_REG_6, BPF_REG_10),
+ BPF_ALU64_IMM(BPF_ADD, BPF_REG_6, -16),
+ BPF_LD_MAP_FD(BPF_REG_1, 0),
+ BPF_MOV64_IMM(BPF_REG_2, 8),
+ BPF_MOV64_IMM(BPF_REG_3, 0),
+ BPF_MOV64_REG(BPF_REG_4, BPF_REG_6),
+ BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_ringbuf_reserve_dynptr),
+ BPF_MOV64_REG(BPF_REG_1, BPF_REG_6),
+ BPF_MOV64_REG(BPF_REG_2, BPF_REG_6),
+ BPF_MOV64_IMM(BPF_REG_3, 0),
+ BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, BPF_PSEUDO_KFUNC_CALL, 0, 0),
+ BPF_MOV64_REG(BPF_REG_1, BPF_REG_6),
+ BPF_MOV64_IMM(BPF_REG_2, 0),
+ BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_ringbuf_discard_dynptr),
+ BPF_MOV64_IMM(BPF_REG_0, 0),
+ BPF_EXIT_INSN(),
+ },
+ .fixup_map_ringbuf = { 3 },
+ .prog_type = BPF_PROG_TYPE_LSM,
+ .kfunc = "bpf",
+ .expected_attach_type = BPF_LSM_MAC,
+ .flags = BPF_F_SLEEPABLE,
+ .errstr = "arg#0 pointer type STRUCT bpf_dynptr_kern points to unsupported dynamic pointer type",
+ .result = REJECT,
+ .fixup_kfunc_btf_id = {
+ { "bpf_verify_pkcs7_signature", 12 },
+ },
+},
+{
+ "kfunc dynamic pointer param: arg not a dynamic pointer",
+ .insns = {
+ BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
+ BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),
+ BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -8),
+ BPF_MOV64_REG(BPF_REG_2, BPF_REG_1),
+ BPF_MOV64_IMM(BPF_REG_3, 0),
+ BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, BPF_PSEUDO_KFUNC_CALL, 0, 0),
+ BPF_EXIT_INSN(),
+ },
+ .prog_type = BPF_PROG_TYPE_LSM,
+ .kfunc = "bpf",
+ .expected_attach_type = BPF_LSM_MAC,
+ .flags = BPF_F_SLEEPABLE,
+ .errstr = "arg#0 pointer type STRUCT bpf_dynptr_kern must be valid and initialized",
+ .result = REJECT,
+ .fixup_kfunc_btf_id = {
+ { "bpf_verify_pkcs7_signature", 5 },
+ },
+},
+{
+ "kfunc dynamic pointer param: arg not a pointer to stack",
+ .insns = {
+ BPF_MOV64_IMM(BPF_REG_1, 0),
+ BPF_MOV64_IMM(BPF_REG_2, 0),
+ BPF_MOV64_IMM(BPF_REG_3, 0),
+ BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, BPF_PSEUDO_KFUNC_CALL, 0, 0),
+ BPF_EXIT_INSN(),
+ },
+ .prog_type = BPF_PROG_TYPE_LSM,
+ .kfunc = "bpf",
+ .expected_attach_type = BPF_LSM_MAC,
+ .flags = BPF_F_SLEEPABLE,
+ .errstr = "arg#0 pointer type STRUCT bpf_dynptr_kern not to stack",
+ .result = REJECT,
+ .fixup_kfunc_btf_id = {
+ { "bpf_verify_pkcs7_signature", 3 },
+ },
+},
--
2.25.1
next prev parent reply other threads:[~2022-08-30 16:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 16:17 [PATCH v14 00/12] bpf: Add kfuncs for PKCS#7 signature verification Roberto Sassu
2022-08-30 16:17 ` [PATCH v14 01/12] bpf: Allow kfuncs to be used in LSM programs Roberto Sassu
2022-08-30 16:17 ` [PATCH v14 02/12] bpf: Move dynptr type check to is_dynptr_type_expected() Roberto Sassu
2022-08-30 16:46 ` Joanne Koong
2022-08-31 9:22 ` Roberto Sassu
2022-08-30 16:17 ` [PATCH v14 03/12] btf: Allow dynamic pointer parameters in kfuncs Roberto Sassu
2022-08-30 16:17 ` [PATCH v14 04/12] bpf: Export bpf_dynptr_get_size() Roberto Sassu
2022-08-30 16:17 ` [PATCH v14 05/12] KEYS: Move KEY_LOOKUP_ to include/linux/key.h and set KEY_LOOKUP_FLAGS_ALL Roberto Sassu
2022-08-31 2:53 ` Jarkko Sakkinen
2022-08-31 4:51 ` Jarkko Sakkinen
2022-08-31 6:29 ` Jarkko Sakkinen
2022-08-31 9:23 ` Roberto Sassu
2022-08-31 15:33 ` Alexei Starovoitov
2022-08-31 15:55 ` Roberto Sassu
2022-09-02 3:27 ` Jarkko Sakkinen
2022-08-30 16:17 ` [PATCH v14 06/12] bpf: Add bpf_lookup_*_key() and bpf_key_put() kfuncs Roberto Sassu
2022-08-30 16:17 ` [PATCH v14 07/12] bpf: Add bpf_verify_pkcs7_signature() kfunc Roberto Sassu
2022-08-30 16:17 ` [PATCH v14 08/12] selftests/bpf: Compile kernel with everything as built-in Roberto Sassu
2022-08-30 16:17 ` [PATCH v14 09/12] selftests/bpf: Add verifier tests for bpf_lookup_*_key() and bpf_key_put() Roberto Sassu
2022-08-30 16:17 ` [PATCH v14 10/12] selftests/bpf: Add additional tests for bpf_lookup_*_key() Roberto Sassu
2022-08-30 16:17 ` [PATCH v14 11/12] selftests/bpf: Add test for bpf_verify_pkcs7_signature() kfunc Roberto Sassu
2022-08-30 16:17 ` Roberto Sassu [this message]
2022-08-30 16:54 ` [PATCH v14 12/12] selftests/bpf: Add verifier tests for dynamic pointers parameters in kfuncs Joanne Koong
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=20220830161716.754078-13-roberto.sassu@huaweicloud.com \
--to=roberto.sassu@huaweicloud.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=deso@posteo.net \
--cc=dhowells@redhat.com \
--cc=haoluo@google.com \
--cc=jarkko@kernel.org \
--cc=jmorris@namei.org \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=mingo@redhat.com \
--cc=mykolal@fb.com \
--cc=paul@paul-moore.com \
--cc=roberto.sassu@huawei.com \
--cc=rostedt@goodmis.org \
--cc=sdf@google.com \
--cc=serge@hallyn.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yhs@fb.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.