Messages in this thread Patch in this message | | | From | Christian Göttsche <> | Subject | [PATCH v3 7/8] bpf: use new capable_any functionality | Date | Wed, 15 Jun 2022 17:26:21 +0200 |
| |
Use the new added capable_any function in appropriate cases, where a task is required to have any of two capabilities.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com> --- v3: rename to capable_any() --- kernel/bpf/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 2b69306d3c6e..92e274c7a5c2 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -2473,7 +2473,7 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr) !bpf_capable()) return -EPERM; - if (is_net_admin_prog_type(type) && !capable(CAP_NET_ADMIN) && !capable(CAP_SYS_ADMIN)) + if (is_net_admin_prog_type(type) && !capable_any(CAP_NET_ADMIN, CAP_SYS_ADMIN)) return -EPERM; if (is_perfmon_prog_type(type) && !perfmon_capable()) return -EPERM; -- 2.36.1
| |