Commit 0ccbe495 authored by Eduard Zingerman's avatar Eduard Zingerman Committed by Alexei Starovoitov
Browse files

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



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

Signed-off-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20230325025524.144043-9-eddyz87@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent a3c830ae

tools/testing/selftests/bpf/prog_tests/verifier.c

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include "cap_helpers.h"

#include "verifier_and.skel.h"

#include "verifier_array_access.skel.h"

#include "verifier_basic_stack.skel.h"



__maybe_unused

static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -32,3 +33,4 @@ static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_fac 


void test_verifier_and(void)                  { RUN(verifier_and); }

void test_verifier_array_access(void)         { RUN(verifier_array_access); }

void test_verifier_basic_stack(void)          { RUN(verifier_basic_stack); }

tools/testing/selftests/bpf/progs/verifier_basic_stack.c

0 → 100644
+100 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Converted from tools/testing/selftests/bpf/verifier/basic_stack.c */



#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>

#include "bpf_misc.h"



struct {

	__uint(type, BPF_MAP_TYPE_HASH);

	__uint(max_entries, 1);

	__type(key, long long);

	__type(value, long long);

} map_hash_8b SEC(".maps");



SEC("socket")

__description("stack out of bounds")

__failure __msg("invalid write to stack")

__failure_unpriv

__naked void stack_out_of_bounds(void)

{

	asm volatile ("					\

	r1 = 0;						\

	*(u64*)(r10 + 8) = r1;				\

	exit;						\

"	::: __clobber_all);

}



SEC("socket")

__description("uninitialized stack1")

__failure __msg("invalid indirect read from stack")

__failure_unpriv

__naked void uninitialized_stack1(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	exit;						\

"	:

	: __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("uninitialized stack2")

__failure __msg("invalid read from stack")

__failure_unpriv

__naked void uninitialized_stack2(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r0 = *(u64*)(r2 - 8);				\

	exit;						\

"	::: __clobber_all);

}



SEC("socket")

__description("invalid fp arithmetic")

__failure __msg("R1 subtraction from stack pointer")

__failure_unpriv

__naked void invalid_fp_arithmetic(void)

{

	/* If this gets ever changed, make sure JITs can deal with it. */

	asm volatile ("					\

	r0 = 0;						\

	r1 = r10;					\

	r1 -= 8;					\

	*(u64*)(r1 + 0) = r0;				\

	exit;						\

"	::: __clobber_all);

}



SEC("socket")

__description("non-invalid fp arithmetic")

__success __success_unpriv __retval(0)

__naked void non_invalid_fp_arithmetic(void)

{

	asm volatile ("					\

	r0 = 0;						\

	*(u64*)(r10 - 8) = r0;				\

	exit;						\

"	::: __clobber_all);

}



SEC("socket")

__description("misaligned read from stack")

__failure __msg("misaligned stack access")

__failure_unpriv

__naked void misaligned_read_from_stack(void)

{

	asm volatile ("					\

	r2 = r10;					\

	r0 = *(u64*)(r2 - 4);				\

	exit;						\

"	::: __clobber_all);

}



char _license[] SEC("license") = "GPL";

tools/testing/selftests/bpf/verifier/basic_stack.c

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
{

	"stack out of bounds",

	.insns = {

	BPF_ST_MEM(BPF_DW, BPF_REG_10, 8, 0),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid write to stack",

	.result = REJECT,

},

{

	"uninitialized stack1",

	.insns = {

	BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),

	BPF_LD_MAP_FD(BPF_REG_1, 0),

	BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),

	BPF_EXIT_INSN(),

	},

	.fixup_map_hash_8b = { 2 },

	.errstr = "invalid indirect read from stack",

	.result = REJECT,

},

{

	"uninitialized stack2",

	.insns = {

	BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),

	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_2, -8),

	BPF_EXIT_INSN(),

	},

	.errstr = "invalid read from stack",

	.result = REJECT,

},

{

	"invalid fp arithmetic",

	/* If this gets ever changed, make sure JITs can deal with it. */

	.insns = {

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),

	BPF_ALU64_IMM(BPF_SUB, BPF_REG_1, 8),

	BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, 0),

	BPF_EXIT_INSN(),

	},

	.errstr = "R1 subtraction from stack pointer",

	.result = REJECT,

},

{

	"non-invalid fp arithmetic",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_STX_MEM(BPF_DW, BPF_REG_10, BPF_REG_0, -8),

	BPF_EXIT_INSN(),

	},

	.result = ACCEPT,

},

{

	"misaligned read from stack",

	.insns = {

	BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),

	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_2, -4),

	BPF_EXIT_INSN(),

	},

	.errstr = "misaligned stack access",

	.result = REJECT,

},