From: Hao Sun <sunhao.th@gmail.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
John Fastabend <john.fastabend@gmail.com>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>
Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
Hao Sun <sunhao.th@gmail.com>
Subject: [PATCH bpf-next v3 3/3] bpf: Adapt and add tests for detecting jump to reserved code
Date: Wed, 11 Oct 2023 11:00:14 +0200 [thread overview]
Message-ID: <20231011-jmp-into-reserved-fields-v3-3-97d2aa979788@gmail.com> (raw)
In-Reply-To: <20231011-jmp-into-reserved-fields-v3-0-97d2aa979788@gmail.com>
Adapt errstr of existing tests to make them pass, and add a new case
to test backward jump to reserved code.
Signed-off-by: Hao Sun <sunhao.th@gmail.com>
---
tools/testing/selftests/bpf/verifier/ld_imm64.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/bpf/verifier/ld_imm64.c b/tools/testing/selftests/bpf/verifier/ld_imm64.c
index f9297900cea6..aa3ada0062d9 100644
--- a/tools/testing/selftests/bpf/verifier/ld_imm64.c
+++ b/tools/testing/selftests/bpf/verifier/ld_imm64.c
@@ -9,8 +9,7 @@
BPF_MOV64_IMM(BPF_REG_0, 2),
BPF_EXIT_INSN(),
},
- .errstr = "invalid BPF_LD_IMM insn",
- .errstr_unpriv = "R1 pointer comparison",
+ .errstr = "jump to reserved code",
.result = REJECT,
},
{
@@ -23,8 +22,7 @@
BPF_LD_IMM64(BPF_REG_0, 1),
BPF_EXIT_INSN(),
},
- .errstr = "invalid BPF_LD_IMM insn",
- .errstr_unpriv = "R1 pointer comparison",
+ .errstr = "jump to reserved code",
.result = REJECT,
},
{
@@ -144,3 +142,13 @@
.errstr = "unrecognized bpf_ld_imm64 insn",
.result = REJECT,
},
+{
+ "test15 ld_imm64",
+ .insns = {
+ BPF_LD_IMM64(BPF_REG_0, 0),
+ BPF_JMP_IMM(BPF_JEQ, BPF_REG_1, 0, -2),
+ BPF_EXIT_INSN(),
+ },
+ .errstr = "jump to reserved code",
+ .result = REJECT,
+},
--
2.34.1
prev parent reply other threads:[~2023-10-11 9:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 9:00 [PATCH bpf-next v3 0/3] bpf: Detect jumping to reserved code of ld_imm64 Hao Sun
2023-10-11 9:00 ` [PATCH bpf-next v3 1/3] bpf: Detect jumping to reserved code during check_cfg() Hao Sun
2023-10-11 13:38 ` Alexei Starovoitov
2023-10-12 6:32 ` Hao Sun
2023-10-12 8:14 ` Shung-Hsi Yu
2023-10-12 15:02 ` Alexei Starovoitov
2023-10-13 3:27 ` Shung-Hsi Yu
2023-10-20 0:25 ` Alexei Starovoitov
2023-10-24 11:57 ` Shung-Hsi Yu
2023-10-11 9:00 ` [PATCH bpf-next v3 2/3] bpf: Report internal error on incorrect ld_imm64 in check_ld_imm() Hao Sun
2023-10-11 9:00 ` Hao Sun [this message]
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=20231011-jmp-into-reserved-fields-v3-3-97d2aa979788@gmail.com \
--to=sunhao.th@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/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