From: Mauricio Vasquez B <mauricio.vasquez@polito.it>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
netdev@vger.kernel.org
Cc: Yonghong Song <yhs@fb.com>
Subject: [RFC PATCH bpf-next v3 5/7] bpf: restrict use of peek/push/pop
Date: Tue, 18 Sep 2018 06:52:56 +0200 [thread overview]
Message-ID: <153724637653.7866.3309569197587729502.stgit@kernel> (raw)
In-Reply-To: <153724634652.7866.6354309647800281793.stgit@kernel>
Restrict the use of peek, push and pop helpers only to queue and stack
maps.
Signed-off-by: Mauricio Vasquez B <mauricio.vasquez@polito.it>
---
kernel/bpf/verifier.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index b9e005188f0e..1628ffe48e32 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -2084,6 +2084,13 @@ static int check_map_func_compatibility(struct bpf_verifier_env *env,
if (func_id != BPF_FUNC_sk_select_reuseport)
goto error;
break;
+ case BPF_MAP_TYPE_QUEUE:
+ case BPF_MAP_TYPE_STACK:
+ if (func_id != BPF_FUNC_map_peek_elem &&
+ func_id != BPF_FUNC_map_pop_elem &&
+ func_id != BPF_FUNC_map_push_elem)
+ goto error;
+ break;
default:
break;
}
@@ -2139,6 +2146,13 @@ static int check_map_func_compatibility(struct bpf_verifier_env *env,
if (map->map_type != BPF_MAP_TYPE_REUSEPORT_SOCKARRAY)
goto error;
break;
+ case BPF_FUNC_map_peek_elem:
+ case BPF_FUNC_map_pop_elem:
+ case BPF_FUNC_map_push_elem:
+ if (map->map_type != BPF_MAP_TYPE_QUEUE &&
+ map->map_type != BPF_MAP_TYPE_STACK)
+ goto error;
+ break;
default:
break;
}
next prev parent reply other threads:[~2018-09-18 10:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-18 4:52 [RFC PATCH bpf-next v3 0/7] Implement bpf queue/stack maps Mauricio Vasquez B
2018-09-18 4:52 ` [RFC PATCH bpf-next v3 1/7] bpf: rename stack trace map Mauricio Vasquez B
2018-09-18 23:05 ` Alexei Starovoitov
2018-09-19 2:53 ` Mauricio Vasquez
2018-09-18 4:52 ` [RFC PATCH bpf-next v3 2/7] bpf/syscall: allow key to be null in map functions Mauricio Vasquez B
2018-09-18 4:52 ` [RFC PATCH bpf-next v3 3/7] bpf: add lookup_and_delete map operation Mauricio Vasquez B
2018-09-18 4:52 ` [RFC PATCH bpf-next v3 4/7] bpf: add bpf queue and stack maps Mauricio Vasquez B
2018-09-18 23:27 ` Alexei Starovoitov
2018-09-19 4:28 ` Mauricio Vasquez
[not found] ` <12a0d7d2-9590-b44f-803a-a00eefe611c1@polito.it>
2018-10-02 0:26 ` Alexei Starovoitov
2018-10-03 17:01 ` Mauricio Vasquez
2018-10-03 21:10 ` Alexei Starovoitov
2018-09-18 4:52 ` Mauricio Vasquez B [this message]
2018-09-18 4:53 ` [RFC PATCH bpf-next v3 6/7] Sync uapi/bpf.h to tools/include Mauricio Vasquez B
2018-09-18 4:53 ` [RFC PATCH bpf-next v3 7/7] selftests/bpf: add test cases for queue and stack maps Mauricio Vasquez B
2018-09-18 23:32 ` Alexei Starovoitov
2018-09-19 4:36 ` Mauricio Vasquez
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=153724637653.7866.3309569197587729502.stgit@kernel \
--to=mauricio.vasquez@polito.it \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
--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).