diff options
| author | Stanislav Fomichev <sdf@google.com> | 2022-04-25 15:04:48 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2022-04-25 17:03:57 -0700 |
| commit | d9d31cf88702ae071bec033e5c8714048aa71285 (patch) | |
| tree | 914c59d71150ae88802cc8b10d6d5d0d532fec6c /include | |
| parent | 246bdfa52f33ecfa52546ed67287de4eab165b2e (diff) | |
| download | linux-stable-d9d31cf88702ae071bec033e5c8714048aa71285.tar.gz linux-stable-d9d31cf88702ae071bec033e5c8714048aa71285.tar.bz2 linux-stable-d9d31cf88702ae071bec033e5c8714048aa71285.zip | |
bpf: Use bpf_prog_run_array_cg_flags everywhere
Rename bpf_prog_run_array_cg_flags to bpf_prog_run_array_cg and
use it everywhere. check_return_code already enforces sane
return ranges for all cgroup types. (only egress and bind hooks have
uncanonical return ranges, the rest is using [0, 1])
No functional changes.
v2:
- 'func_ret & 1' under explicit test (Andrii & Martin)
Suggested-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220425220448.3669032-1-sdf@google.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bpf-cgroup.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index 88a51b242adc..669d96d074ad 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -225,24 +225,20 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk, #define BPF_CGROUP_RUN_SA_PROG(sk, uaddr, atype) \ ({ \ - u32 __unused_flags; \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) \ __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - NULL, \ - &__unused_flags); \ + NULL, NULL); \ __ret; \ }) #define BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, atype, t_ctx) \ ({ \ - u32 __unused_flags; \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) { \ lock_sock(sk); \ __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - t_ctx, \ - &__unused_flags); \ + t_ctx, NULL); \ release_sock(sk); \ } \ __ret; \ |