From: Song Liu <songliubraving@fb.com>
To: <netdev@vger.kernel.org>, <bpf@vger.kernel.org>
Cc: <ast@kernel.org>, <daniel@iogearbox.net>, <kernel-team@fb.com>,
<lmb@cloudflare.com>, <jannh@google.com>,
<gregkh@linuxfoundation.org>, Song Liu <songliubraving@fb.com>
Subject: [PATCH v2 bpf-next 4/4] bpftool: use libbpf_[enable|disable]_sys_bpf()
Date: Thu, 27 Jun 2019 13:19:23 -0700 [thread overview]
Message-ID: <20190627201923.2589391-5-songliubraving@fb.com> (raw)
In-Reply-To: <20190627201923.2589391-1-songliubraving@fb.com>
This patch calls libbpf_[enable|disable]_sys_bpf() from bpftool. This
allows users with access to /dev/bpf to perform operations like root.
Signed-off-by: Song Liu <songliubraving@fb.com>
---
tools/bpf/bpftool/feature.c | 2 +-
tools/bpf/bpftool/main.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/bpf/bpftool/feature.c b/tools/bpf/bpftool/feature.c
index d672d9086fff..772c9f445d34 100644
--- a/tools/bpf/bpftool/feature.c
+++ b/tools/bpf/bpftool/feature.c
@@ -583,7 +583,7 @@ static int do_probe(int argc, char **argv)
/* Detection assumes user has sufficient privileges (CAP_SYS_ADMIN).
* Let's approximate, and restrict usage to root user only.
*/
- if (geteuid()) {
+ if (!libbpf_enable_sys_bpf()) {
p_err("please run this command as root user");
return -1;
}
diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
index 4879f6395c7e..56959c5ac552 100644
--- a/tools/bpf/bpftool/main.c
+++ b/tools/bpf/bpftool/main.c
@@ -390,6 +390,10 @@ int main(int argc, char **argv)
if (argc < 0)
usage();
+ if (!libbpf_enable_sys_bpf()) {
+ p_err("cannot enable access to sys_bpf()");
+ usage();
+ }
ret = cmd_select(cmds, argc, argv, do_help);
if (json_output)
@@ -400,5 +404,6 @@ int main(int argc, char **argv)
delete_pinned_obj_table(&map_table);
}
+ libbpf_disable_sys_bpf();
return ret;
}
--
2.17.1
prev parent reply other threads:[~2019-06-27 20:19 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 20:19 [PATCH v2 bpf-next 0/4] sys_bpf() access control via /dev/bpf Song Liu
2019-06-27 20:19 ` [PATCH v2 bpf-next 1/4] bpf: unprivileged BPF access " Song Liu
2019-06-27 23:40 ` Andy Lutomirski
2019-06-27 23:42 ` Andy Lutomirski
2019-06-28 10:28 ` Christian Brauner
2019-06-28 9:05 ` Lorenz Bauer
2019-06-28 19:04 ` Song Liu
2019-06-30 0:12 ` Andy Lutomirski
2019-07-01 9:03 ` Song Liu
2019-07-02 1:59 ` Andy Lutomirski
2019-07-02 18:24 ` Kees Cook
2019-07-02 21:32 ` Andy Lutomirski
2019-07-02 23:48 ` Song Liu
2019-07-22 20:53 ` Song Liu
2019-07-23 10:45 ` Lorenz Bauer
2019-07-23 15:11 ` Andy Lutomirski
2019-07-23 22:56 ` Song Liu
2019-07-24 1:40 ` Andy Lutomirski
2019-07-24 6:30 ` Song Liu
2019-07-27 18:20 ` Song Liu
2019-07-30 5:07 ` Song Liu
2019-07-30 20:24 ` Andy Lutomirski
2019-07-31 8:10 ` Song Liu
2019-07-31 19:09 ` Andy Lutomirski
2019-08-02 7:21 ` Song Liu
2019-08-04 22:16 ` Andy Lutomirski
2019-08-05 0:08 ` Andy Lutomirski
2019-08-05 5:47 ` Andy Lutomirski
2019-08-05 7:36 ` Song Liu
2019-08-05 17:23 ` Andy Lutomirski
2019-08-05 19:21 ` Alexei Starovoitov
2019-08-05 21:25 ` Andy Lutomirski
2019-08-05 22:21 ` Andy Lutomirski
2019-08-06 1:11 ` Alexei Starovoitov
2019-08-07 5:24 ` Andy Lutomirski
2019-08-07 9:03 ` Lorenz Bauer
2019-08-07 13:52 ` Andy Lutomirski
2019-08-13 21:58 ` Alexei Starovoitov
2019-08-13 22:26 ` Daniel Colascione
2019-08-13 23:24 ` Andy Lutomirski
2019-08-13 23:06 ` Andy Lutomirski
2019-08-14 0:57 ` Alexei Starovoitov
2019-08-14 17:51 ` Andy Lutomirski
2019-08-14 22:05 ` Alexei Starovoitov
2019-08-14 22:30 ` Andy Lutomirski
2019-08-14 23:33 ` Alexei Starovoitov
2019-08-14 23:59 ` Andy Lutomirski
2019-08-15 0:36 ` Alexei Starovoitov
2019-08-15 11:24 ` Jordan Glover
2019-08-15 17:28 ` Alexei Starovoitov
2019-08-15 18:36 ` Andy Lutomirski
2019-08-15 23:08 ` Alexei Starovoitov
2019-08-16 9:34 ` Jordan Glover
2019-08-16 9:59 ` Thomas Gleixner
2019-08-16 11:33 ` Jordan Glover
2019-08-16 19:52 ` Alexei Starovoitov
2019-08-16 20:28 ` Thomas Gleixner
2019-08-17 15:02 ` Alexei Starovoitov
2019-08-17 15:44 ` Andy Lutomirski
2019-08-19 9:15 ` Thomas Gleixner
2019-08-19 17:27 ` Alexei Starovoitov
2019-08-19 17:38 ` Andy Lutomirski
2019-08-15 18:43 ` Jordan Glover
2019-08-15 19:46 ` Kees Cook
2019-08-15 23:46 ` Alexei Starovoitov
2019-08-16 0:54 ` Andy Lutomirski
2019-08-16 5:56 ` Song Liu
2019-08-16 21:45 ` Alexei Starovoitov
2019-08-16 22:22 ` Christian Brauner
2019-08-17 15:08 ` Alexei Starovoitov
2019-08-17 15:16 ` Christian Brauner
2019-08-17 15:36 ` Alexei Starovoitov
2019-08-17 15:42 ` Christian Brauner
2019-08-22 14:17 ` Daniel Borkmann
2019-08-22 15:16 ` Andy Lutomirski
2019-08-22 15:17 ` RFC: very rough draft of a bpf permission model Andy Lutomirski
2019-08-22 23:26 ` Alexei Starovoitov
2019-08-23 23:09 ` Andy Lutomirski
2019-08-26 22:36 ` Alexei Starovoitov
2019-08-27 0:05 ` Andy Lutomirski
2019-08-27 0:34 ` Alexei Starovoitov
2019-08-22 22:48 ` [PATCH v2 bpf-next 1/4] bpf: unprivileged BPF access via /dev/bpf Alexei Starovoitov
2019-07-30 20:20 ` Andy Lutomirski
2019-07-31 7:44 ` Song Liu
2019-06-28 9:01 ` Lorenz Bauer
2019-06-28 19:10 ` Song Liu
2019-07-01 9:34 ` Lorenz Bauer
2019-07-02 19:22 ` Andrii Nakryiko
2019-07-03 7:28 ` Greg KH
2019-06-27 20:19 ` [PATCH v2 bpf-next 2/4] bpf: sync tools/include/uapi/linux/bpf.h Song Liu
2019-06-27 20:19 ` [PATCH v2 bpf-next 3/4] libbpf: add libbpf_[enable|disable]_sys_bpf() Song Liu
2019-06-27 20:19 ` Song Liu [this message]
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=20190627201923.2589391-5-songliubraving@fb.com \
--to=songliubraving@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=gregkh@linuxfoundation.org \
--cc=jannh@google.com \
--cc=kernel-team@fb.com \
--cc=lmb@cloudflare.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).