From: Mauricio Vasquez B <mauricio.vasquez@polito.it>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
netdev@vger.kernel.org
Subject: [RFC PATCH bpf-next v4 5/7] bpf: restrict use of peek/push/pop
Date: Thu, 04 Oct 2018 19:12:49 +0200 [thread overview]
Message-ID: <153867316984.10087.3212168623519526172.stgit@kernel> (raw)
In-Reply-To: <153867314370.10087.2202062772042248653.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 489667f93061..8b1f1b348782 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -2328,6 +2328,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;
}
@@ -2384,6 +2391,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-10-05 0:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 17:12 [RFC PATCH bpf-next v4 0/7] Implement bpf queue/stack maps Mauricio Vasquez B
2018-10-04 17:12 ` [RFC PATCH bpf-next v4 1/7] bpf: rename stack trace map operations Mauricio Vasquez B
2018-10-04 17:12 ` [RFC PATCH bpf-next v4 2/7] bpf/syscall: allow key to be null in map functions Mauricio Vasquez B
2018-10-04 17:12 ` [RFC PATCH bpf-next v4 3/7] bpf: add MAP_LOOKUP_AND_DELETE_ELEM syscall Mauricio Vasquez B
2018-10-04 23:37 ` Alexei Starovoitov
2018-10-04 17:12 ` [RFC PATCH bpf-next v4 4/7] bpf: add bpf queue and stack maps Mauricio Vasquez B
2018-10-04 23:57 ` Alexei Starovoitov
[not found] ` <86a2498d-4e2e-7fb9-5139-9738e3796b01@polito.it>
2018-10-05 18:41 ` Alexei Starovoitov
2018-10-08 3:15 ` Mauricio Vasquez
2018-10-04 17:12 ` Mauricio Vasquez B [this message]
2018-10-04 23:57 ` [RFC PATCH bpf-next v4 5/7] bpf: restrict use of peek/push/pop Alexei Starovoitov
2018-10-04 17:12 ` [RFC PATCH bpf-next v4 6/7] Sync uapi/bpf.h to tools/include Mauricio Vasquez B
2018-10-04 17:13 ` [RFC PATCH bpf-next v4 7/7] selftests/bpf: add test cases for queue and stack maps Mauricio Vasquez B
2018-10-04 23:59 ` Alexei Starovoitov
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=153867316984.10087.3212168623519526172.stgit@kernel \
--to=mauricio.vasquez@polito.it \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--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