From: Quentin Monnet <quentin.monnet@netronome.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>
Cc: netdev@vger.kernel.org, oss-drivers@netronome.com,
Quentin Monnet <quentin.monnet@netronome.com>
Subject: [PATCH bpf 1/4] tools: bpftool: prevent infinite loop in get_fdinfo()
Date: Thu, 8 Nov 2018 11:52:25 +0000 [thread overview]
Message-ID: <1541677948-12473-2-git-send-email-quentin.monnet@netronome.com> (raw)
In-Reply-To: <1541677948-12473-1-git-send-email-quentin.monnet@netronome.com>
Function getline() returns -1 on failure to read a line, thus creating
an infinite loop in get_fdinfo() if the key is not found. Fix it by
calling the function only as long as we get a strictly positive return
value.
Found by copying the code for a key which is not always present...
Fixes: 71bb428fe2c1 ("tools: bpf: add bpftool")
Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
tools/bpf/bpftool/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
index 1149565be4b1..acd839e0e801 100644
--- a/tools/bpf/bpftool/common.c
+++ b/tools/bpf/bpftool/common.c
@@ -312,7 +312,7 @@ char *get_fdinfo(int fd, const char *key)
return NULL;
}
- while ((n = getline(&line, &line_n, fdi))) {
+ while ((n = getline(&line, &line_n, fdi)) > 0) {
char *value;
int len;
--
2.7.4
next prev parent reply other threads:[~2018-11-08 21:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-08 11:52 [PATCH bpf 0/4] tools: bpftool: bring several minor fixes to bpftool Quentin Monnet
2018-11-08 11:52 ` Quentin Monnet [this message]
2018-11-08 11:52 ` [PATCH bpf 2/4] tools: bpftool: fix plain output and doc for --bpffs option Quentin Monnet
2018-11-08 11:52 ` [PATCH bpf 3/4] tools: bpftool: pass an argument to silence open_obj_pinned() Quentin Monnet
2018-11-08 11:52 ` [PATCH bpf 4/4] tools: bpftool: update references to other man pages in documentation Quentin Monnet
2018-11-09 7:38 ` [PATCH bpf 0/4] tools: bpftool: bring several minor fixes to bpftool Daniel Borkmann
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=1541677948-12473-2-git-send-email-quentin.monnet@netronome.com \
--to=quentin.monnet@netronome.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.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).