Add two tests for PTR_TO_BTF_ID vs. null ptr comparison, one for PTR_TO_BTF_ID in the ctx structure and the other for PTR_TO_BTF_ID after one level pointer chasing. In both cases, the test ensures condition is not removed. For example, for this test struct bpf_fentry_test_t { struct bpf_fentry_test_t *a; }; int BPF_PROG(test7, struct bpf_fentry_test_t *arg) { if (arg == 0) test7_result = 1; return 0; } Before the previous verifier change, we have xlated codes: int test7(long long unsigned int * ctx): ; int BPF_PROG(test7, struct bpf_fentry_test_t *arg) 0: (79) r1 = *(u64 *)(r1 +0) ; int BPF_PROG(test7, struct bpf_fentry_test_t *arg) 1: (b4) w0 = 0 2: (95) exit After the previous verifier change, we have: int test7(long long unsigned int * ctx): ; int BPF_PROG(test7, struct bpf_fentry_test_t *arg) 0: (79) r1 = *(u64 *)(r1 +0) ; if (arg == 0) 1: (55) if r1 != 0x0 goto pc+4 ; test7_result = 1; 2: (18) r1 = map[id:6][0]+48 4: (b7) r2 = 1 5: (7b) *(u64 *)(r1 +0) = r2 ; int BPF_PROG(test7, struct bpf_fentry_test_t *arg) 6: (b4) w0 = 0 7: (95) exit Signed-off-by: Yonghong Song <yhs@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: John Fastabend <john.fastabend@gmail.com> Acked-by: Andrii Nakryiko <andriin@fb.com> Link: https://lore.kernel.org/bpf/20200630171241.2523875-1-yhs@fb.com
79 lines
1.6 KiB
C
79 lines
1.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* Copyright (c) 2019 Facebook */
|
|
#include <linux/bpf.h>
|
|
#include <bpf/bpf_helpers.h>
|
|
#include <bpf/bpf_tracing.h>
|
|
|
|
char _license[] SEC("license") = "GPL";
|
|
|
|
__u64 test1_result = 0;
|
|
SEC("fentry/bpf_fentry_test1")
|
|
int BPF_PROG(test1, int a)
|
|
{
|
|
test1_result = a == 1;
|
|
return 0;
|
|
}
|
|
|
|
__u64 test2_result = 0;
|
|
SEC("fentry/bpf_fentry_test2")
|
|
int BPF_PROG(test2, int a, __u64 b)
|
|
{
|
|
test2_result = a == 2 && b == 3;
|
|
return 0;
|
|
}
|
|
|
|
__u64 test3_result = 0;
|
|
SEC("fentry/bpf_fentry_test3")
|
|
int BPF_PROG(test3, char a, int b, __u64 c)
|
|
{
|
|
test3_result = a == 4 && b == 5 && c == 6;
|
|
return 0;
|
|
}
|
|
|
|
__u64 test4_result = 0;
|
|
SEC("fentry/bpf_fentry_test4")
|
|
int BPF_PROG(test4, void *a, char b, int c, __u64 d)
|
|
{
|
|
test4_result = a == (void *)7 && b == 8 && c == 9 && d == 10;
|
|
return 0;
|
|
}
|
|
|
|
__u64 test5_result = 0;
|
|
SEC("fentry/bpf_fentry_test5")
|
|
int BPF_PROG(test5, __u64 a, void *b, short c, int d, __u64 e)
|
|
{
|
|
test5_result = a == 11 && b == (void *)12 && c == 13 && d == 14 &&
|
|
e == 15;
|
|
return 0;
|
|
}
|
|
|
|
__u64 test6_result = 0;
|
|
SEC("fentry/bpf_fentry_test6")
|
|
int BPF_PROG(test6, __u64 a, void *b, short c, int d, void * e, __u64 f)
|
|
{
|
|
test6_result = a == 16 && b == (void *)17 && c == 18 && d == 19 &&
|
|
e == (void *)20 && f == 21;
|
|
return 0;
|
|
}
|
|
|
|
struct bpf_fentry_test_t {
|
|
struct bpf_fentry_test_t *a;
|
|
};
|
|
|
|
__u64 test7_result = 0;
|
|
SEC("fentry/bpf_fentry_test7")
|
|
int BPF_PROG(test7, struct bpf_fentry_test_t *arg)
|
|
{
|
|
if (arg == 0)
|
|
test7_result = 1;
|
|
return 0;
|
|
}
|
|
|
|
__u64 test8_result = 0;
|
|
SEC("fentry/bpf_fentry_test8")
|
|
int BPF_PROG(test8, struct bpf_fentry_test_t *arg)
|
|
{
|
|
if (arg->a == 0)
|
|
test8_result = 1;
|
|
return 0;
|
|
}
|