selftests/bpf: verifier/int_ptr.c converted to inline assembly

Test verifier/int_ptr.c automatically converted to use inline assembly.

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20230325025524.144043-25-eddyz87@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/verifier.c b/tools/testing/selftests/bpf/prog_tests/verifier.c
index 2c3745a..d9180da 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@ -21,6 +21,7 @@
 #include "verifier_helper_packet_access.skel.h"
 #include "verifier_helper_restricted.skel.h"
 #include "verifier_helper_value_access.skel.h"
+#include "verifier_int_ptr.skel.h"
 
 __maybe_unused
 static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -64,3 +65,4 @@ void test_verifier_helper_access_var_len(void) { RUN(verifier_helper_access_var_
 void test_verifier_helper_packet_access(void) { RUN(verifier_helper_packet_access); }
 void test_verifier_helper_restricted(void)    { RUN(verifier_helper_restricted); }
 void test_verifier_helper_value_access(void)  { RUN(verifier_helper_value_access); }
+void test_verifier_int_ptr(void)              { RUN(verifier_int_ptr); }

diff --git a/tools/testing/selftests/bpf/progs/verifier_int_ptr.c b/tools/testing/selftests/bpf/progs/verifier_int_ptr.c
new file mode 100644 (file)
index 0000000..b054f9c
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/verifier_int_ptr.c
@@ -0,0 +1,157 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Converted from tools/testing/selftests/bpf/verifier/int_ptr.c */
+
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+
+SEC("cgroup/sysctl")
+__description("ARG_PTR_TO_LONG uninitialized")
+__failure __msg("invalid indirect read from stack R4 off -16+0 size 8")
+__naked void arg_ptr_to_long_uninitialized(void)
+{
+       asm volatile ("                                 \
+       /* bpf_strtoul arg1 (buf) */                    \
+       r7 = r10;                                       \
+       r7 += -8;                                       \
+       r0 = 0x00303036;                                \
+       *(u64*)(r7 + 0) = r0;                           \
+       r1 = r7;                                        \
+       /* bpf_strtoul arg2 (buf_len) */                \
+       r2 = 4;                                         \
+       /* bpf_strtoul arg3 (flags) */                  \
+       r3 = 0;                                         \
+       /* bpf_strtoul arg4 (res) */                    \
+       r7 += -8;                                       \
+       r4 = r7;                                        \
+       /* bpf_strtoul() */                             \
+       call %[bpf_strtoul];                            \
+       r0 = 1;                                         \
+       exit;                                           \
+"      :
+       : __imm(bpf_strtoul)
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("ARG_PTR_TO_LONG half-uninitialized")
+/* in privileged mode reads from uninitialized stack locations are permitted */
+__success __failure_unpriv
+__msg_unpriv("invalid indirect read from stack R4 off -16+4 size 8")
+__retval(0)
+__naked void ptr_to_long_half_uninitialized(void)
+{
+       asm volatile ("                                 \
+       /* bpf_strtoul arg1 (buf) */                    \
+       r7 = r10;                                       \
+       r7 += -8;                                       \
+       r0 = 0x00303036;                                \
+       *(u64*)(r7 + 0) = r0;                           \
+       r1 = r7;                                        \
+       /* bpf_strtoul arg2 (buf_len) */                \
+       r2 = 4;                                         \
+       /* bpf_strtoul arg3 (flags) */                  \
+       r3 = 0;                                         \
+       /* bpf_strtoul arg4 (res) */                    \
+       r7 += -8;                                       \
+       *(u32*)(r7 + 0) = r0;                           \
+       r4 = r7;                                        \
+       /* bpf_strtoul() */                             \
+       call %[bpf_strtoul];                            \
+       r0 = 0;                                         \
+       exit;                                           \
+"      :
+       : __imm(bpf_strtoul)
+       : __clobber_all);
+}
+
+SEC("cgroup/sysctl")
+__description("ARG_PTR_TO_LONG misaligned")
+__failure __msg("misaligned stack access off (0x0; 0x0)+-20+0 size 8")
+__naked void arg_ptr_to_long_misaligned(void)
+{
+       asm volatile ("                                 \
+       /* bpf_strtoul arg1 (buf) */                    \
+       r7 = r10;                                       \
+       r7 += -8;                                       \
+       r0 = 0x00303036;                                \
+       *(u64*)(r7 + 0) = r0;                           \
+       r1 = r7;                                        \
+       /* bpf_strtoul arg2 (buf_len) */                \
+       r2 = 4;                                         \
+       /* bpf_strtoul arg3 (flags) */                  \
+       r3 = 0;                                         \
+       /* bpf_strtoul arg4 (res) */                    \
+       r7 += -12;                                      \
+       r0 = 0;                                         \
+       *(u32*)(r7 + 0) = r0;                           \
+       *(u64*)(r7 + 4) = r0;                           \
+       r4 = r7;                                        \
+       /* bpf_strtoul() */                             \
+       call %[bpf_strtoul];                            \
+       r0 = 1;                                         \
+       exit;                                           \
+"      :
+       : __imm(bpf_strtoul)
+       : __clobber_all);
+}
+
+SEC("cgroup/sysctl")
+__description("ARG_PTR_TO_LONG size < sizeof(long)")
+__failure __msg("invalid indirect access to stack R4 off=-4 size=8")
+__naked void to_long_size_sizeof_long(void)
+{
+       asm volatile ("                                 \
+       /* bpf_strtoul arg1 (buf) */                    \
+       r7 = r10;                                       \
+       r7 += -16;                                      \
+       r0 = 0x00303036;                                \
+       *(u64*)(r7 + 0) = r0;                           \
+       r1 = r7;                                        \
+       /* bpf_strtoul arg2 (buf_len) */                \
+       r2 = 4;                                         \
+       /* bpf_strtoul arg3 (flags) */                  \
+       r3 = 0;                                         \
+       /* bpf_strtoul arg4 (res) */                    \
+       r7 += 12;                                       \
+       *(u32*)(r7 + 0) = r0;                           \
+       r4 = r7;                                        \
+       /* bpf_strtoul() */                             \
+       call %[bpf_strtoul];                            \
+       r0 = 1;                                         \
+       exit;                                           \
+"      :
+       : __imm(bpf_strtoul)
+       : __clobber_all);
+}
+
+SEC("cgroup/sysctl")
+__description("ARG_PTR_TO_LONG initialized")
+__success
+__naked void arg_ptr_to_long_initialized(void)
+{
+       asm volatile ("                                 \
+       /* bpf_strtoul arg1 (buf) */                    \
+       r7 = r10;                                       \
+       r7 += -8;                                       \
+       r0 = 0x00303036;                                \
+       *(u64*)(r7 + 0) = r0;                           \
+       r1 = r7;                                        \
+       /* bpf_strtoul arg2 (buf_len) */                \
+       r2 = 4;                                         \
+       /* bpf_strtoul arg3 (flags) */                  \
+       r3 = 0;                                         \
+       /* bpf_strtoul arg4 (res) */                    \
+       r7 += -8;                                       \
+       *(u64*)(r7 + 0) = r0;                           \
+       r4 = r7;                                        \
+       /* bpf_strtoul() */                             \
+       call %[bpf_strtoul];                            \
+       r0 = 1;                                         \
+       exit;                                           \
+"      :
+       : __imm(bpf_strtoul)
+       : __clobber_all);
+}
+
+char _license[] SEC("license") = "GPL";

diff --git a/tools/testing/selftests/bpf/verifier/int_ptr.c b/tools/testing/selftests/bpf/verifier/int_ptr.c
deleted file mode 100644 (file)
index 02d9e00..0000000
--- a/tools/testing/selftests/bpf/verifier/int_ptr.c
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-       "ARG_PTR_TO_LONG uninitialized",
-       .insns = {
-               /* bpf_strtoul arg1 (buf) */
-               BPF_MOV64_REG(BPF_REG_7, BPF_REG_10),
-               BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -8),
-               BPF_MOV64_IMM(BPF_REG_0, 0x00303036),
-               BPF_STX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 0),
-
-               BPF_MOV64_REG(BPF_REG_1, BPF_REG_7),
-
-               /* bpf_strtoul arg2 (buf_len) */
-               BPF_MOV64_IMM(BPF_REG_2, 4),
-
-               /* bpf_strtoul arg3 (flags) */
-               BPF_MOV64_IMM(BPF_REG_3, 0),
-
-               /* bpf_strtoul arg4 (res) */
-               BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -8),
-               BPF_MOV64_REG(BPF_REG_4, BPF_REG_7),
-
-               /* bpf_strtoul() */
-               BPF_EMIT_CALL(BPF_FUNC_strtoul),
-
-               BPF_MOV64_IMM(BPF_REG_0, 1),
-               BPF_EXIT_INSN(),
-       },
-       .result = REJECT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL,
-       .errstr = "invalid indirect read from stack R4 off -16+0 size 8",
-},
-{
-       "ARG_PTR_TO_LONG half-uninitialized",
-       .insns = {
-               /* bpf_strtoul arg1 (buf) */
-               BPF_MOV64_REG(BPF_REG_7, BPF_REG_10),
-               BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -8),
-               BPF_MOV64_IMM(BPF_REG_0, 0x00303036),
-               BPF_STX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 0),
-
-               BPF_MOV64_REG(BPF_REG_1, BPF_REG_7),
-
-               /* bpf_strtoul arg2 (buf_len) */
-               BPF_MOV64_IMM(BPF_REG_2, 4),
-
-               /* bpf_strtoul arg3 (flags) */
-               BPF_MOV64_IMM(BPF_REG_3, 0),
-
-               /* bpf_strtoul arg4 (res) */
-               BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -8),
-               BPF_STX_MEM(BPF_W, BPF_REG_7, BPF_REG_0, 0),
-               BPF_MOV64_REG(BPF_REG_4, BPF_REG_7),
-
-               /* bpf_strtoul() */
-               BPF_EMIT_CALL(BPF_FUNC_strtoul),
-
-               BPF_MOV64_IMM(BPF_REG_0, 0),
-               BPF_EXIT_INSN(),
-       },
-       .result_unpriv = REJECT,
-       .errstr_unpriv = "invalid indirect read from stack R4 off -16+4 size 8",
-       /* in privileged mode reads from uninitialized stack locations are permitted */
-       .result = ACCEPT,
-},
-{
-       "ARG_PTR_TO_LONG misaligned",
-       .insns = {
-               /* bpf_strtoul arg1 (buf) */
-               BPF_MOV64_REG(BPF_REG_7, BPF_REG_10),
-               BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -8),
-               BPF_MOV64_IMM(BPF_REG_0, 0x00303036),
-               BPF_STX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 0),
-
-               BPF_MOV64_REG(BPF_REG_1, BPF_REG_7),
-
-               /* bpf_strtoul arg2 (buf_len) */
-               BPF_MOV64_IMM(BPF_REG_2, 4),
-
-               /* bpf_strtoul arg3 (flags) */
-               BPF_MOV64_IMM(BPF_REG_3, 0),
-
-               /* bpf_strtoul arg4 (res) */
-               BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -12),
-               BPF_MOV64_IMM(BPF_REG_0, 0),
-               BPF_STX_MEM(BPF_W, BPF_REG_7, BPF_REG_0, 0),
-               BPF_STX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 4),
-               BPF_MOV64_REG(BPF_REG_4, BPF_REG_7),
-
-               /* bpf_strtoul() */
-               BPF_EMIT_CALL(BPF_FUNC_strtoul),
-
-               BPF_MOV64_IMM(BPF_REG_0, 1),
-               BPF_EXIT_INSN(),
-       },
-       .result = REJECT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL,
-       .errstr = "misaligned stack access off (0x0; 0x0)+-20+0 size 8",
-},
-{
-       "ARG_PTR_TO_LONG size < sizeof(long)",
-       .insns = {
-               /* bpf_strtoul arg1 (buf) */
-               BPF_MOV64_REG(BPF_REG_7, BPF_REG_10),
-               BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -16),
-               BPF_MOV64_IMM(BPF_REG_0, 0x00303036),
-               BPF_STX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 0),
-
-               BPF_MOV64_REG(BPF_REG_1, BPF_REG_7),
-
-               /* bpf_strtoul arg2 (buf_len) */
-               BPF_MOV64_IMM(BPF_REG_2, 4),
-
-               /* bpf_strtoul arg3 (flags) */
-               BPF_MOV64_IMM(BPF_REG_3, 0),
-
-               /* bpf_strtoul arg4 (res) */
-               BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, 12),
-               BPF_STX_MEM(BPF_W, BPF_REG_7, BPF_REG_0, 0),
-               BPF_MOV64_REG(BPF_REG_4, BPF_REG_7),
-
-               /* bpf_strtoul() */
-               BPF_EMIT_CALL(BPF_FUNC_strtoul),
-
-               BPF_MOV64_IMM(BPF_REG_0, 1),
-               BPF_EXIT_INSN(),
-       },
-       .result = REJECT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL,
-       .errstr = "invalid indirect access to stack R4 off=-4 size=8",
-},
-{
-       "ARG_PTR_TO_LONG initialized",
-       .insns = {
-               /* bpf_strtoul arg1 (buf) */
-               BPF_MOV64_REG(BPF_REG_7, BPF_REG_10),
-               BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -8),
-               BPF_MOV64_IMM(BPF_REG_0, 0x00303036),
-               BPF_STX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 0),
-
-               BPF_MOV64_REG(BPF_REG_1, BPF_REG_7),
-
-               /* bpf_strtoul arg2 (buf_len) */
-               BPF_MOV64_IMM(BPF_REG_2, 4),
-
-               /* bpf_strtoul arg3 (flags) */
-               BPF_MOV64_IMM(BPF_REG_3, 0),
-
-               /* bpf_strtoul arg4 (res) */
-               BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, -8),
-               BPF_STX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 0),
-               BPF_MOV64_REG(BPF_REG_4, BPF_REG_7),
-
-               /* bpf_strtoul() */
-               BPF_EMIT_CALL(BPF_FUNC_strtoul),
-
-               BPF_MOV64_IMM(BPF_REG_0, 1),
-               BPF_EXIT_INSN(),
-       },
-       .result = ACCEPT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL,
-},