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

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



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

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


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

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

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

#include "verifier_basic_stack.skel.h"

#include "verifier_bounds_deduction.skel.h"

#include "verifier_bounds_mix_sign_unsign.skel.h"



__maybe_unused

static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -36,3 +37,4 @@ 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); }

void test_verifier_bounds_deduction(void)     { RUN(verifier_bounds_deduction); }

void test_verifier_bounds_mix_sign_unsign(void) { RUN(verifier_bounds_mix_sign_unsign); }

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

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

/* Converted from tools/testing/selftests/bpf/verifier/bounds_mix_sign_unsign.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("bounds checks mixing signed and unsigned, positive bounds")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_positive_bounds(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = 2;						\

	if r2 >= r1 goto l0_%=;				\

	if r1 s> 4 goto l0_%=;				\

	r0 += r1;					\

	r1 = 0;						\

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

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void checks_mixing_signed_and_unsigned(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = -1;					\

	if r1 > r2 goto l0_%=;				\

	if r1 s> 1 goto l0_%=;				\

	r0 += r1;					\

	r1 = 0;						\

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

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 2")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_variant_2(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = -1;					\

	if r1 > r2 goto l0_%=;				\

	r8 = 0;						\

	r8 += r1;					\

	if r8 s> 1 goto l0_%=;				\

	r0 += r8;					\

	r0 = 0;						\

	*(u8*)(r8 + 0) = r0;				\

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 3")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_variant_3(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = -1;					\

	if r1 > r2 goto l0_%=;				\

	r8 = r1;					\

	if r8 s> 1 goto l0_%=;				\

	r0 += r8;					\

	r0 = 0;						\

	*(u8*)(r8 + 0) = r0;				\

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 4")

__success __success_unpriv __retval(0)

__naked void signed_and_unsigned_variant_4(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = 1;						\

	r1 &= r2;					\

	if r1 s> 1 goto l0_%=;				\

	r0 += r1;					\

	r1 = 0;						\

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

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 5")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_variant_5(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = -1;					\

	if r1 > r2 goto l0_%=;				\

	if r1 s> 1 goto l0_%=;				\

	r0 += 4;					\

	r0 -= r1;					\

	r1 = 0;						\

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

	r0 = 0;						\

l0_%=:	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 6")

__failure __msg("R4 min value is negative, either use unsigned")

__failure_unpriv

__naked void signed_and_unsigned_variant_6(void)

{

	asm volatile ("					\

	r9 = r1;					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = r9;					\

	r2 = 0;						\

	r3 = r10;					\

	r3 += -512;					\

	r4 = *(u64*)(r10 - 16);				\

	r6 = -1;					\

	if r4 > r6 goto l0_%=;				\

	if r4 s> 1 goto l0_%=;				\

	r4 += 1;					\

	r5 = 0;						\

	r6 = 0;						\

	*(u16*)(r10 - 512) = r6;			\

	call %[bpf_skb_load_bytes];			\

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_skb_load_bytes)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 7")

__success __success_unpriv __retval(0)

__naked void signed_and_unsigned_variant_7(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = %[__imm_0];				\

	if r1 > r2 goto l0_%=;				\

	if r1 s> 1 goto l0_%=;				\

	r0 += r1;					\

	r1 = 0;						\

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

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b),

	  __imm_const(__imm_0, 1024 * 1024 * 1024)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 8")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_variant_8(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = -1;					\

	if r2 > r1 goto l1_%=;				\

	r0 = 0;						\

	exit;						\

l1_%=:	if r1 s> 1 goto l0_%=;				\

	r0 += r1;					\

	r1 = 0;						\

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

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 9")

__success __success_unpriv __retval(0)

__naked void signed_and_unsigned_variant_9(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = -9223372036854775808ULL ll;		\

	if r2 > r1 goto l1_%=;				\

	r0 = 0;						\

	exit;						\

l1_%=:	if r1 s> 1 goto l0_%=;				\

	r0 += r1;					\

	r1 = 0;						\

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

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 10")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_variant_10(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = 0;						\

	if r2 > r1 goto l1_%=;				\

	r0 = 0;						\

	exit;						\

l1_%=:	if r1 s> 1 goto l0_%=;				\

	r0 += r1;					\

	r1 = 0;						\

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

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 11")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_variant_11(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = -1;					\

	if r2 >= r1 goto l1_%=;				\

	/* Dead branch. */				\

	r0 = 0;						\

	exit;						\

l1_%=:	if r1 s> 1 goto l0_%=;				\

	r0 += r1;					\

	r1 = 0;						\

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

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 12")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_variant_12(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = -6;					\

	if r2 >= r1 goto l1_%=;				\

	r0 = 0;						\

	exit;						\

l1_%=:	if r1 s> 1 goto l0_%=;				\

	r0 += r1;					\

	r1 = 0;						\

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

l0_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 13")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_variant_13(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = 2;						\

	if r2 >= r1 goto l0_%=;				\

	r7 = 1;						\

	if r7 s> 0 goto l1_%=;				\

l0_%=:	r0 = 0;						\

	exit;						\

l1_%=:	r7 += r1;					\

	if r7 s> 4 goto l2_%=;				\

	r0 += r7;					\

	r1 = 0;						\

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

l2_%=:	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 14")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_variant_14(void)

{

	asm volatile ("					\

	r9 = *(u32*)(r1 + %[__sk_buff_mark]);		\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = -1;					\

	r8 = 2;						\

	if r9 == 42 goto l1_%=;				\

	if r8 s> r1 goto l2_%=;				\

l3_%=:	if r1 s> 1 goto l2_%=;				\

	r0 += r1;					\

l0_%=:	r1 = 0;						\

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

l2_%=:	r0 = 0;						\

	exit;						\

l1_%=:	if r1 > r2 goto l2_%=;				\

	goto l3_%=;					\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b),

	  __imm_const(__sk_buff_mark, offsetof(struct __sk_buff, mark))

	: __clobber_all);

}



SEC("socket")

__description("bounds checks mixing signed and unsigned, variant 15")

__failure __msg("unbounded min value")

__failure_unpriv

__naked void signed_and_unsigned_variant_15(void)

{

	asm volatile ("					\

	call %[bpf_ktime_get_ns];			\

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

	r1 = 0;						\

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

	r2 = r10;					\

	r2 += -8;					\

	r1 = %[map_hash_8b] ll;				\

	call %[bpf_map_lookup_elem];			\

	if r0 == 0 goto l0_%=;				\

	r1 = *(u64*)(r10 - 16);				\

	r2 = -6;					\

	if r2 >= r1 goto l1_%=;				\

l0_%=:	r0 = 0;						\

	exit;						\

l1_%=:	r0 += r1;					\

	if r0 > 1 goto l2_%=;				\

	r0 = 0;						\

	exit;						\

l2_%=:	r1 = 0;						\

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

	r0 = 0;						\

	exit;						\

"	:

	: __imm(bpf_ktime_get_ns),

	  __imm(bpf_map_lookup_elem),

	  __imm_addr(map_hash_8b)

	: __clobber_all);

}



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

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

deleted100644 → 0
+0 −411

File deleted.

Preview size limit exceeded, changes collapsed.