From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andriin@fb.com>
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
Martin KaFai Lau <kafai@fb.com>, David Miller <davem@redhat.com>,
John Fastabend <john.fastabend@gmail.com>,
Wenbo Zhang <ethercflow@gmail.com>,
KP Singh <kpsingh@chromium.org>,
Brendan Gregg <bgregg@netflix.com>,
Florent Revest <revest@chromium.org>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: [RFC PATCH v11 bpf-next 01/14] tools resolve_btfids: Add size check to get_id function
Date: Sun, 9 Aug 2020 17:02:49 +0200 [thread overview]
Message-ID: <20200809150302.686149-2-jolsa@kernel.org> (raw)
In-Reply-To: <20200809150302.686149-1-jolsa@kernel.org>
To make sure we don't crash on malformed symbols.
Acked-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/bpf/resolve_btfids/main.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c
index 52d883325a23..b83369887df6 100644
--- a/tools/bpf/resolve_btfids/main.c
+++ b/tools/bpf/resolve_btfids/main.c
@@ -199,9 +199,16 @@ static char *get_id(const char *prefix_end)
/*
* __BTF_ID__func__vfs_truncate__0
* prefix_end = ^
+ * pos = ^
*/
- char *p, *id = strdup(prefix_end + sizeof("__") - 1);
+ int len = strlen(prefix_end);
+ int pos = sizeof("__") - 1;
+ char *p, *id;
+ if (pos >= len)
+ return NULL;
+
+ id = strdup(prefix_end + pos);
if (id) {
/*
* __BTF_ID__func__vfs_truncate__0
--
2.25.4
next prev parent reply other threads:[~2020-08-09 15:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-09 15:02 [RFC PATCH v11 bpf-next 00/14] bpf: Add d_path helper Jiri Olsa
2020-08-09 15:02 ` Jiri Olsa [this message]
2020-08-09 15:02 ` [RFC PATCH v11 bpf-next 02/14] tools resolve_btfids: Add support for set symbols Jiri Olsa
2020-08-09 15:02 ` [RFC PATCH v11 bpf-next 03/14] bpf: Move btf_resolve_size into __btf_resolve_size Jiri Olsa
2020-08-09 15:02 ` [RFC PATCH v11 bpf-next 04/14] bpf: Add elem_id pointer as argument to __btf_resolve_size Jiri Olsa
2020-08-09 15:02 ` [RFC PATCH v11 bpf-next 05/14] bpf: Add type_id " Jiri Olsa
2020-08-09 15:02 ` [RFC PATCH v11 bpf-next 06/14] bpf: Remove recursion call in btf_struct_access Jiri Olsa
2020-08-09 15:02 ` [RFC PATCH v11 bpf-next 07/14] bpf: Factor btf_struct_access function Jiri Olsa
2020-08-09 15:02 ` [RFC PATCH v11 bpf-next 08/14] bpf: Add btf_struct_ids_match function Jiri Olsa
2020-08-11 6:02 ` Andrii Nakryiko
2020-08-09 15:02 ` [RFC PATCH v11 bpf-next 09/14] bpf: Add BTF_SET_START/END macros Jiri Olsa
2020-08-09 15:02 ` [RFC PATCH v11 bpf-next 10/14] bpf: Add d_path helper Jiri Olsa
2020-08-18 0:14 ` KP Singh
2020-08-09 15:02 ` [RFC PATCH v11 bpf-next 11/14] bpf: Update .BTF_ids section in btf.rst with sets info Jiri Olsa
2020-08-09 15:03 ` [RFC PATCH v11 bpf-next 12/14] selftests/bpf: Add verifier test for d_path helper Jiri Olsa
2020-08-09 15:03 ` [RFC PATCH v11 bpf-next 13/14] selftests/bpf: Add " Jiri Olsa
2020-08-09 15:03 ` [RFC PATCH v11 bpf-next 14/14] selftests/bpf: Add set test to resolve_btfids 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=20200809150302.686149-2-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=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=revest@chromium.org \
--cc=songliubraving@fb.com \
--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).