summaryrefslogtreecommitdiff
path: root/net/core/filter.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2023-03-02 22:42:59 +0300
committerAlexei Starovoitov <ast@kernel.org>2023-03-03 09:37:07 +0300
commitc501bf55c88b834adefda870c7c092ec9052a437 (patch)
tree92fae07fc76e2f63bb24b759b5337b915a409f2b /net/core/filter.c
parentcacad346f67ce9604dcc9db10f1f1769dabb3891 (diff)
downloadlinux-c501bf55c88b834adefda870c7c092ec9052a437.tar.xz
bpf: Make bpf_get_current_[ancestor_]cgroup_id() available for all program types
These helpers are safe to call from any context and there's no reason to restrict access to them. Remove them from bpf_trace and filter lists and add to bpf_base_func_proto() under perfmon_capable(). v2: After consulting with Andrii, relocated in bpf_base_func_proto() so that they require bpf_capable() but not perfomon_capable() as it doesn't read from or affect others on the system. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/r/ZAD8QyoszMZiTzBY@slm.duckdns.org Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'net/core/filter.c')
-rw-r--r--net/core/filter.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index 8f3124e06133..a2dc44e70ea0 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -8165,12 +8165,6 @@ sk_msg_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
return &bpf_sk_storage_delete_proto;
case BPF_FUNC_get_netns_cookie:
return &bpf_get_netns_cookie_sk_msg_proto;
-#ifdef CONFIG_CGROUPS
- case BPF_FUNC_get_current_cgroup_id:
- return &bpf_get_current_cgroup_id_proto;
- case BPF_FUNC_get_current_ancestor_cgroup_id:
- return &bpf_get_current_ancestor_cgroup_id_proto;
-#endif
#ifdef CONFIG_CGROUP_NET_CLASSID
case BPF_FUNC_get_cgroup_classid:
return &bpf_get_cgroup_classid_curr_proto;