Commit 80b7d819 authored May 31, 2017 by Chenbo Feng Committed by David S. Miller Jun 02, 2017

bpf: Remove the capability check for cgroup skb eBPF program



Currently loading a cgroup skb eBPF program require a CAP_SYS_ADMIN
capability while attaching the program to a cgroup only requires the
user have CAP_NET_ADMIN privilege. We can escape the capability
check when load the program just like socket filter program to make
the capability requirement consistent.

Change since v1:
Change the code style in order to be compliant with checkpatch.pl
preference

Signed-off-by: Chenbo Feng <fengc@google.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent fb9a307d

kernel/bpf/syscall.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -815,7 +815,9 @@ static int bpf_prog_load(union bpf_attr *attr)
		attr->kern_version != LINUX_VERSION_CODE)
		return -EINVAL;

		if (type != BPF_PROG_TYPE_SOCKET_FILTER && !capable(CAP_SYS_ADMIN))
		if (type != BPF_PROG_TYPE_SOCKET_FILTER &&
		type != BPF_PROG_TYPE_CGROUP_SKB &&
		!capable(CAP_SYS_ADMIN))
		return -EPERM;

		/* plain bpf_prog allocation */