diff options
| author | Maciej Żenczykowski <maze@google.com> | 2020-06-20 14:26:16 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-06-23 17:45:42 -0700 |
| commit | b338cb921e6739ff59ce32f43342779fe5ffa732 (patch) | |
| tree | a9589fa146b69544c83a1bce1160e89324f5a6ec /kernel | |
| parent | c4c0bdc0d2d084ed847c7066bdf59fe2cd25aa17 (diff) | |
| download | linux-stable-b338cb921e6739ff59ce32f43342779fe5ffa732.tar.gz linux-stable-b338cb921e6739ff59ce32f43342779fe5ffa732.tar.bz2 linux-stable-b338cb921e6739ff59ce32f43342779fe5ffa732.zip | |
bpf: Restore behaviour of CAP_SYS_ADMIN allowing the loading of networking bpf programs
This is a fix for a regression in commit 2c78ee898d8f ("bpf: Implement CAP_BPF").
Before the above commit it was possible to load network bpf programs
with just the CAP_SYS_ADMIN privilege.
The Android bpfloader happens to run in such a configuration (it has
SYS_ADMIN but not NET_ADMIN) and creates maps and loads bpf programs
for later use by Android's netd (which has NET_ADMIN but not SYS_ADMIN).
Fixes: 2c78ee898d8f ("bpf: Implement CAP_BPF")
Reported-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Link: https://lore.kernel.org/bpf/20200620212616.93894-1-zenczykowski@gmail.com
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 8da159936bab..7d946435587d 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -2121,7 +2121,7 @@ static int bpf_prog_load(union bpf_attr *attr, union bpf_attr __user *uattr) !bpf_capable()) return -EPERM; - if (is_net_admin_prog_type(type) && !capable(CAP_NET_ADMIN)) + if (is_net_admin_prog_type(type) && !capable(CAP_NET_ADMIN) && !capable(CAP_SYS_ADMIN)) return -EPERM; if (is_perfmon_prog_type(type) && !perfmon_capable()) return -EPERM; |