From: "Maciej Żenczykowski" <zenczykowski@gmail.com>
To: "Maciej Żenczykowski" <maze@google.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>
Cc: Linux Network Development Mailing List <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
BPF Mailing List <bpf@vger.kernel.org>,
"David S . Miller" <davem@davemloft.net>
Subject: [PATCH] restore behaviour of CAP_SYS_ADMIN allowing the loading of net bpf program
Date: Thu, 18 Jun 2020 12:59:56 -0700 [thread overview]
Message-ID: <20200618195956.73967-1-zenczykowski@gmail.com> (raw)
In-Reply-To: <CAHo-OoyU5OHQuqpTEo-uAQcwcLpzkXezFY6Re-Hv6jGM9aSFSA@mail.gmail.com>
From: Maciej Żenczykowski <maze@google.com>
This is a 5.8-rc1 regression.
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Fixes: 2c78ee898d8f ("bpf: Implement CAP_BPF")
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
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 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;
--
2.27.0.290.gba653c62da-goog
next prev parent reply other threads:[~2020-06-18 20:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-18 6:43 capable_bpf_net_admin() Maciej Żenczykowski
2020-06-18 7:01 ` capable_bpf_net_admin() Alexei Starovoitov
2020-06-18 10:19 ` capable_bpf_net_admin() Maciej Żenczykowski
2020-06-18 19:03 ` capable_bpf_net_admin() John Stultz
2020-06-18 19:21 ` capable_bpf_net_admin() Maciej Żenczykowski
2020-06-18 19:59 ` Maciej Żenczykowski [this message]
2020-06-18 21:02 ` [PATCH] restore behaviour of CAP_SYS_ADMIN allowing the loading of net bpf program Alexei Starovoitov
2020-06-20 21:26 ` [PATCH bpf v2] restore behaviour of CAP_SYS_ADMIN allowing the loading of networking bpf programs Maciej Żenczykowski
2020-06-22 19:44 ` John Stultz
2020-06-24 0:54 ` Alexei Starovoitov
2020-07-06 20:11 ` John Stultz
2020-07-06 20:15 ` Daniel Borkmann
2020-07-06 20:36 ` John Stultz
2020-06-20 1:59 ` capable_bpf_net_admin() John Stultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200618195956.73967-1-zenczykowski@gmail.com \
--to=zenczykowski@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=maze@google.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).