22ed8d5a46
We add 2 new kfuncs that are following the RET_PTR_TO_MEM
capability from the previous commit.
Then we test them in selftests:
the first tests are testing valid case, and are not failing,
and the later ones are actually preventing the program to be loaded
because they are wrong.
To work around that, we mark the failing ones as not autoloaded
(with SEC("?tc")), and we manually enable them one by one, ensuring
the verifier rejects them.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Link: https://lore.kernel.org/r/20220906151303.2780789-8-benjamin.tissoires@redhat.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
166 lines
3.8 KiB
C
166 lines
3.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* Copyright (c) 2021 Facebook */
|
|
#include <vmlinux.h>
|
|
#include <bpf/bpf_helpers.h>
|
|
|
|
extern int bpf_kfunc_call_test2(struct sock *sk, __u32 a, __u32 b) __ksym;
|
|
extern __u64 bpf_kfunc_call_test1(struct sock *sk, __u32 a, __u64 b,
|
|
__u32 c, __u64 d) __ksym;
|
|
|
|
extern struct prog_test_ref_kfunc *bpf_kfunc_call_test_acquire(unsigned long *sp) __ksym;
|
|
extern void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p) __ksym;
|
|
extern void bpf_kfunc_call_test_pass_ctx(struct __sk_buff *skb) __ksym;
|
|
extern void bpf_kfunc_call_test_pass1(struct prog_test_pass1 *p) __ksym;
|
|
extern void bpf_kfunc_call_test_pass2(struct prog_test_pass2 *p) __ksym;
|
|
extern void bpf_kfunc_call_test_mem_len_pass1(void *mem, int len) __ksym;
|
|
extern void bpf_kfunc_call_test_mem_len_fail2(__u64 *mem, int len) __ksym;
|
|
extern int *bpf_kfunc_call_test_get_rdwr_mem(struct prog_test_ref_kfunc *p, const int rdwr_buf_size) __ksym;
|
|
extern int *bpf_kfunc_call_test_get_rdonly_mem(struct prog_test_ref_kfunc *p, const int rdonly_buf_size) __ksym;
|
|
|
|
SEC("tc")
|
|
int kfunc_call_test2(struct __sk_buff *skb)
|
|
{
|
|
struct bpf_sock *sk = skb->sk;
|
|
|
|
if (!sk)
|
|
return -1;
|
|
|
|
sk = bpf_sk_fullsock(sk);
|
|
if (!sk)
|
|
return -1;
|
|
|
|
return bpf_kfunc_call_test2((struct sock *)sk, 1, 2);
|
|
}
|
|
|
|
SEC("tc")
|
|
int kfunc_call_test1(struct __sk_buff *skb)
|
|
{
|
|
struct bpf_sock *sk = skb->sk;
|
|
__u64 a = 1ULL << 32;
|
|
__u32 ret;
|
|
|
|
if (!sk)
|
|
return -1;
|
|
|
|
sk = bpf_sk_fullsock(sk);
|
|
if (!sk)
|
|
return -1;
|
|
|
|
a = bpf_kfunc_call_test1((struct sock *)sk, 1, a | 2, 3, a | 4);
|
|
ret = a >> 32; /* ret should be 2 */
|
|
ret += (__u32)a; /* ret should be 12 */
|
|
|
|
return ret;
|
|
}
|
|
|
|
SEC("tc")
|
|
int kfunc_call_test_ref_btf_id(struct __sk_buff *skb)
|
|
{
|
|
struct prog_test_ref_kfunc *pt;
|
|
unsigned long s = 0;
|
|
int ret = 0;
|
|
|
|
pt = bpf_kfunc_call_test_acquire(&s);
|
|
if (pt) {
|
|
if (pt->a != 42 || pt->b != 108)
|
|
ret = -1;
|
|
bpf_kfunc_call_test_release(pt);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
SEC("tc")
|
|
int kfunc_call_test_pass(struct __sk_buff *skb)
|
|
{
|
|
struct prog_test_pass1 p1 = {};
|
|
struct prog_test_pass2 p2 = {};
|
|
short a = 0;
|
|
__u64 b = 0;
|
|
long c = 0;
|
|
char d = 0;
|
|
int e = 0;
|
|
|
|
bpf_kfunc_call_test_pass_ctx(skb);
|
|
bpf_kfunc_call_test_pass1(&p1);
|
|
bpf_kfunc_call_test_pass2(&p2);
|
|
|
|
bpf_kfunc_call_test_mem_len_pass1(&a, sizeof(a));
|
|
bpf_kfunc_call_test_mem_len_pass1(&b, sizeof(b));
|
|
bpf_kfunc_call_test_mem_len_pass1(&c, sizeof(c));
|
|
bpf_kfunc_call_test_mem_len_pass1(&d, sizeof(d));
|
|
bpf_kfunc_call_test_mem_len_pass1(&e, sizeof(e));
|
|
bpf_kfunc_call_test_mem_len_fail2(&b, -1);
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct syscall_test_args {
|
|
__u8 data[16];
|
|
size_t size;
|
|
};
|
|
|
|
SEC("syscall")
|
|
int kfunc_syscall_test(struct syscall_test_args *args)
|
|
{
|
|
const long size = args->size;
|
|
|
|
if (size > sizeof(args->data))
|
|
return -7; /* -E2BIG */
|
|
|
|
bpf_kfunc_call_test_mem_len_pass1(&args->data, sizeof(args->data));
|
|
bpf_kfunc_call_test_mem_len_pass1(&args->data, sizeof(*args));
|
|
bpf_kfunc_call_test_mem_len_pass1(&args->data, size);
|
|
|
|
return 0;
|
|
}
|
|
|
|
SEC("syscall")
|
|
int kfunc_syscall_test_null(struct syscall_test_args *args)
|
|
{
|
|
/* Must be called with args as a NULL pointer
|
|
* we do not check for it to have the verifier consider that
|
|
* the pointer might not be null, and so we can load it.
|
|
*
|
|
* So the following can not be added:
|
|
*
|
|
* if (args)
|
|
* return -22;
|
|
*/
|
|
|
|
bpf_kfunc_call_test_mem_len_pass1(args, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
SEC("tc")
|
|
int kfunc_call_test_get_mem(struct __sk_buff *skb)
|
|
{
|
|
struct prog_test_ref_kfunc *pt;
|
|
unsigned long s = 0;
|
|
int *p = NULL;
|
|
int ret = 0;
|
|
|
|
pt = bpf_kfunc_call_test_acquire(&s);
|
|
if (pt) {
|
|
p = bpf_kfunc_call_test_get_rdwr_mem(pt, 2 * sizeof(int));
|
|
if (p) {
|
|
p[0] = 42;
|
|
ret = p[1]; /* 108 */
|
|
} else {
|
|
ret = -1;
|
|
}
|
|
|
|
if (ret >= 0) {
|
|
p = bpf_kfunc_call_test_get_rdonly_mem(pt, 2 * sizeof(int));
|
|
if (p)
|
|
ret = p[0]; /* 42 */
|
|
else
|
|
ret = -1;
|
|
}
|
|
|
|
bpf_kfunc_call_test_release(pt);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
char _license[] SEC("license") = "GPL";
|