Commit a1502132 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

bpf: fix up test cases with mixed signed/unsigned bounds 



Fix the few existing test cases that used mixed signed/unsigned
bounds and switch them only to one flavor. Reason why we need this
is that proper boundaries cannot be derived from mixed tests.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6554904

tools/testing/selftests/bpf/test_verifier.c

+4 −4
Original line number Diff line number Diff line
@@ -4969,7 +4969,7 @@ static struct bpf_test tests[] = { 
			BPF_JMP_IMM(BPF_JSGT, BPF_REG_2,

				sizeof(struct test_val), 4),

			BPF_MOV64_IMM(BPF_REG_4, 0),

			BPF_JMP_REG(BPF_JGE, BPF_REG_4, BPF_REG_2, 2),

			BPF_JMP_REG(BPF_JSGE, BPF_REG_4, BPF_REG_2, 2),

			BPF_MOV64_IMM(BPF_REG_3, 0),

			BPF_EMIT_CALL(BPF_FUNC_probe_read),

			BPF_MOV64_IMM(BPF_REG_0, 0),
@@ -4995,7 +4995,7 @@ static struct bpf_test tests[] = { 
			BPF_JMP_IMM(BPF_JSGT, BPF_REG_2,

				sizeof(struct test_val) + 1, 4),

			BPF_MOV64_IMM(BPF_REG_4, 0),

			BPF_JMP_REG(BPF_JGE, BPF_REG_4, BPF_REG_2, 2),

			BPF_JMP_REG(BPF_JSGE, BPF_REG_4, BPF_REG_2, 2),

			BPF_MOV64_IMM(BPF_REG_3, 0),

			BPF_EMIT_CALL(BPF_FUNC_probe_read),

			BPF_MOV64_IMM(BPF_REG_0, 0),
@@ -5023,7 +5023,7 @@ static struct bpf_test tests[] = { 
			BPF_JMP_IMM(BPF_JSGT, BPF_REG_2,

				sizeof(struct test_val) - 20, 4),

			BPF_MOV64_IMM(BPF_REG_4, 0),

			BPF_JMP_REG(BPF_JGE, BPF_REG_4, BPF_REG_2, 2),

			BPF_JMP_REG(BPF_JSGE, BPF_REG_4, BPF_REG_2, 2),

			BPF_MOV64_IMM(BPF_REG_3, 0),

			BPF_EMIT_CALL(BPF_FUNC_probe_read),

			BPF_MOV64_IMM(BPF_REG_0, 0),
@@ -5050,7 +5050,7 @@ static struct bpf_test tests[] = { 
			BPF_JMP_IMM(BPF_JSGT, BPF_REG_2,

				sizeof(struct test_val) - 19, 4),

			BPF_MOV64_IMM(BPF_REG_4, 0),

			BPF_JMP_REG(BPF_JGE, BPF_REG_4, BPF_REG_2, 2),

			BPF_JMP_REG(BPF_JSGE, BPF_REG_4, BPF_REG_2, 2),

			BPF_MOV64_IMM(BPF_REG_3, 0),

			BPF_EMIT_CALL(BPF_FUNC_probe_read),

			BPF_MOV64_IMM(BPF_REG_0, 0),