From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
Yonghong Song <yhs@fb.com>, Martin KaFai Lau <kafai@fb.com>,
David Miller <davem@redhat.com>,
John Fastabend <john.fastabend@gmail.com>,
Jesper Dangaard Brouer <hawk@kernel.org>,
Wenbo Zhang <ethercflow@gmail.com>,
KP Singh <kpsingh@chromium.org>, Andrii Nakryiko <andriin@fb.com>,
bgregg@netflix.com, Florent Revest <revest@chromium.org>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: [PATCH 5/9] bpf: Add support to check on BTF id whitelist for d_path helper
Date: Wed, 6 May 2020 15:29:42 +0200 [thread overview]
Message-ID: <20200506132946.2164578-6-jolsa@kernel.org> (raw)
In-Reply-To: <20200506132946.2164578-1-jolsa@kernel.org>
The BPF helper whitelist checking works as follows:
- helper's whitelist is defined as list of functions in file:
kernel/bpf/helpers-whitelist/helper
- at vmlinux linking time, the bpfwl tool reads the whitelist
and translates functions into BTF IDs, which are compiled as
following data section into vmlinux object:
.BTF_whitelist
BTF_whitelist_<helper1>
BTF_whitelist_<helper2>
BTF_whitelist_<helper3>
Each BTF_whitelist_<helperX> data is a sorted array of BTF ids.
- new 'allowed' function is added to 'struct bpf_func_proto',
which is used by verifier code to check (if defined) on whether
the helper is called from allowed function (from whitelist).
Currently it's needed and implemented only for d_path helper,
but it's easy to add for another helper.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
include/asm-generic/vmlinux.lds.h | 5 +++++
include/linux/bpf.h | 1 +
kernel/bpf/verifier.c | 5 +++++
kernel/trace/bpf_trace.c | 23 +++++++++++++++++++++++
4 files changed, 34 insertions(+)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 71e387a5fe90..6f7ca4f36ed7 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -631,6 +631,11 @@
__start_BTF = .; \
*(.BTF) \
__stop_BTF = .; \
+ } \
+ .BTF_whitelist : AT(ADDR(.BTF_whitelist) - LOAD_OFFSET) { \
+ __start_BTF_whitelist_d_path = .; \
+ *(.BTF_whitelist_d_path) \
+ __stop_BTF_whitelist_d_path = .; \
}
#else
#define BTF
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index bc589cdd8c34..ccacf488429f 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -275,6 +275,7 @@ struct bpf_func_proto {
enum bpf_arg_type arg_type[5];
};
int *btf_id; /* BTF ids of arguments */
+ bool (*allowed)(const struct bpf_prog *prog);
};
/* bpf_context is intentionally undefined structure. Pointer to bpf_context is
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index b988df5ada20..55995de954a0 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -4525,6 +4525,11 @@ static int check_helper_call(struct bpf_verifier_env *env, int func_id, int insn
return -EINVAL;
}
+ if (fn->allowed && !fn->allowed(env->prog)) {
+ verbose(env, "helper call is not allowed in probe\n");
+ return -EINVAL;
+ }
+
/* With LD_ABS/IND some JITs save/restore skb from r1. */
changes_data = bpf_helper_changes_pkt_data(fn->func);
if (changes_data && fn->arg1_type != ARG_PTR_TO_CTX) {
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 3097ab04bdc4..55682d610534 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -13,6 +13,7 @@
#include <linux/kprobes.h>
#include <linux/syscalls.h>
#include <linux/error-injection.h>
+#include <linux/bsearch.h>
#include <asm/tlb.h>
@@ -797,6 +798,27 @@ BPF_CALL_3(bpf_d_path, struct path *, path, char *, buf, u32, sz)
return len;
}
+extern char __weak __start_BTF_whitelist_d_path[];
+extern char __weak __stop_BTF_whitelist_d_path[];
+
+static int btf_id_cmp_func(const void *a, const void *b)
+{
+ const unsigned long *pa = a;
+ const unsigned long *pb = b;
+
+ return *pa - *pb;
+}
+
+static bool bpf_d_path_allowed(const struct bpf_prog *prog)
+{
+ unsigned long *start = (unsigned long *) __start_BTF_whitelist_d_path;
+ unsigned long *stop = (unsigned long *) __stop_BTF_whitelist_d_path;
+ unsigned long id = prog->aux->attach_btf_id;
+
+ return bsearch(&id, start, stop - start, sizeof(unsigned long),
+ btf_id_cmp_func) != NULL;
+}
+
static u32 bpf_d_path_btf_ids[3];
static const struct bpf_func_proto bpf_d_path_proto = {
.func = bpf_d_path,
@@ -806,6 +828,7 @@ static const struct bpf_func_proto bpf_d_path_proto = {
.arg2_type = ARG_PTR_TO_MEM,
.arg3_type = ARG_CONST_SIZE,
.btf_id = bpf_d_path_btf_ids,
+ .allowed = bpf_d_path_allowed,
};
const struct bpf_func_proto *
--
2.25.4
next prev parent reply other threads:[~2020-05-06 13:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 13:29 [RFCv2 0/9] bpf: Add d_path helper Jiri Olsa
2020-05-06 13:29 ` [PATCH 1/9] " Jiri Olsa
2020-05-14 22:06 ` Andrii Nakryiko
2020-05-15 14:59 ` Jiri Olsa
2020-05-06 13:29 ` [PATCH 2/9] bpf: Add d_path whitelist Jiri Olsa
2020-05-06 13:29 ` [PATCH 3/9] bpf: Add bpfwl tool to construct bpf whitelists Jiri Olsa
2020-05-14 22:20 ` Andrii Nakryiko
2020-05-15 14:58 ` Jiri Olsa
2020-05-06 13:29 ` [PATCH 4/9] bpf: Allow nested BTF object to be refferenced by BTF object + offset Jiri Olsa
2020-05-14 22:32 ` Andrii Nakryiko
2020-05-06 13:29 ` Jiri Olsa [this message]
2020-05-06 13:29 ` [PATCH 6/9] bpf: Compile bpfwl tool at kernel compilation start Jiri Olsa
2020-05-14 22:38 ` Andrii Nakryiko
2020-05-15 14:57 ` Jiri Olsa
2020-05-06 13:29 ` [PATCH 7/9] bpf: Compile the BTF id whitelist data in vmlinux Jiri Olsa
2020-05-13 18:29 ` Alexei Starovoitov
2020-05-14 8:05 ` Jiri Olsa
2020-05-14 22:46 ` Andrii Nakryiko
2020-05-15 14:57 ` Jiri Olsa
2020-05-28 17:23 ` Jiri Olsa
2020-05-29 20:48 ` Andrii Nakryiko
2020-05-31 15:10 ` Jiri Olsa
2020-06-01 19:06 ` Andrii Nakryiko
2020-06-02 8:16 ` Jiri Olsa
2020-05-06 13:29 ` [PATCH 8/9] selftests/bpf: Add test for d_path helper Jiri Olsa
2020-05-14 22:48 ` Andrii Nakryiko
2020-05-15 14:57 ` Jiri Olsa
2020-05-06 13:29 ` [PATCH 9/9] selftests/bpf: Add verifier " Jiri Olsa
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=20200506132946.2164578-6-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bgregg@netflix.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@redhat.com \
--cc=ethercflow@gmail.com \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=revest@chromium.org \
--cc=viro@zeniv.linux.org.uk \
--cc=yhs@fb.com \
/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).