Commit d4e9835a authored by Lorenz Bauer's avatar Lorenz Bauer Committed by Zheng Zengkai
Browse files

selftests: bpf: Don't run sk_lookup in verifier tests 

stable inclusion
from stable-v5.10.135
commit 4bfc9dc60873923ffa64ee77084bac55031a30a0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ZWFM

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4bfc9dc60873923ffa64ee77084bac55031a30a0



--------------------------------

commit b4f89463 upstream.

sk_lookup doesn't allow setting data_in for bpf_prog_run. This doesn't
play well with the verifier tests, since they always set a 64 byte
input buffer. Allow not running verifier tests by setting
bpf_test.runs to a negative value and don't run the ctx access case
for sk_lookup. We have dedicated ctx access tests so skipping here
doesn't reduce coverage.

Signed-off-by: default avatarLorenz Bauer <lmb@cloudflare.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210303101816.36774-6-lmb@cloudflare.com


Signed-off-by: default avatarTianchen Ding <dtcccc@linux.alibaba.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarPu Lehui <pulehui@huawei.com>
Reviewed-by: default avatarKuohai Xu <xukuohai@huawei.com>
Reviewed-by: default avatarKuohai Xu <xukuohai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f4f55c33

tools/testing/selftests/bpf/test_verifier.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ struct bpf_test { 
	enum bpf_prog_type prog_type;

	uint8_t flags;

	void (*fill_helper)(struct bpf_test *self);

	uint8_t runs;

	int runs;

#define bpf_testdata_struct_t					\

	struct {						\

		uint32_t retval, retval_unpriv;			\
@@ -1064,7 +1064,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv, 


	run_errs = 0;

	run_successes = 0;

	if (!alignment_prevented_execution && fd_prog >= 0) {

	if (!alignment_prevented_execution && fd_prog >= 0 && test->runs >= 0) {

		uint32_t expected_val;

		int i;

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

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ 
	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_SK_LOOKUP,

	.expected_attach_type = BPF_SK_LOOKUP,

	.runs = -1,

},

/* invalid 8-byte reads from a 4-byte fields in bpf_sk_lookup */

{