Commit b9aad976 authored Jun 02, 2017 by Chenbo Feng

FROMLIST: [net-next,v2,2/2] 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

(url: http://patchwork.ozlabs.org/patch/769460/

)
Signed-off-by: Chenbo Feng <fengc@google.com>
Bug: 30950746
Change-Id: Ibe51235127d6f9349b8f563ad31effc061b278ed

parent 9e3c6555

kernel/bpf/syscall.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -747,7 +747,9 @@ static int bpf_prog_load(union bpf_attr *attr)
	attr->kern_version != LINUX_VERSION_CODE)		attr->kern_version != LINUX_VERSION_CODE)
	return -EINVAL;		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;		return -EPERM;

	/* plain bpf_prog allocation */		/* plain bpf_prog allocation */