From: Xu Kuohai <xukuohai@huaweicloud.com>
To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org, netdev@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Mykola Lysenko <mykolal@fb.com>,
Shuah Khan <shuah@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Jesper Dangaard Brouer <hawk@kernel.org>,
Hou Tao <houtao1@huawei.com>,
Dmitrii Dolgov <9erthalion6@gmail.com>,
Alan Maguire <alan.maguire@oracle.com>,
Kumar Kartikeya Dwivedi <memxor@gmail.com>,
Lorenzo Bianconi <lorenzo@kernel.org>
Subject: [PATCH bpf v2 4/5] selftest/bpf: Fix memory leak in kprobe_multi_test
Date: Mon, 10 Oct 2022 03:04:53 -0400 [thread overview]
Message-ID: <20221010070454.577433-5-xukuohai@huaweicloud.com> (raw)
In-Reply-To: <20221010070454.577433-1-xukuohai@huaweicloud.com>
From: Xu Kuohai <xukuohai@huawei.com>
The get_syms() function in kprobe_multi_test.c does not free the string
memory allocated by sscanf correctly. Fix it.
Fixes: 5b6c7e5c4434 ("selftests/bpf: Add attach bench test")
Signed-off-by: Xu Kuohai <xukuohai@huawei.com>
---
.../bpf/prog_tests/kprobe_multi_test.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
index d457a55ff408..07dd2c5b7f98 100644
--- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
+++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
@@ -360,15 +360,14 @@ static int get_syms(char ***symsp, size_t *cntp)
* to them. Filter out the current culprits - arch_cpu_idle
* and rcu_* functions.
*/
- if (!strcmp(name, "arch_cpu_idle"))
- continue;
- if (!strncmp(name, "rcu_", 4))
- continue;
- if (!strcmp(name, "bpf_dispatcher_xdp_func"))
- continue;
- if (!strncmp(name, "__ftrace_invalid_address__",
- sizeof("__ftrace_invalid_address__") - 1))
+ if (!strcmp(name, "arch_cpu_idle") ||
+ !strncmp(name, "rcu_", 4) ||
+ !strcmp(name, "bpf_dispatcher_xdp_func") ||
+ !strncmp(name, "__ftrace_invalid_address__",
+ sizeof("__ftrace_invalid_address__") - 1)) {
+ free(name);
continue;
+ }
err = hashmap__add(map, name, NULL);
if (err) {
free(name);
@@ -394,7 +393,7 @@ static int get_syms(char ***symsp, size_t *cntp)
hashmap__free(map);
if (err) {
for (i = 0; i < cnt; i++)
- free(syms[cnt]);
+ free(syms[i]);
free(syms);
}
return err;
--
2.30.2
next prev parent reply other threads:[~2022-10-10 6:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-10 7:04 [PATCH bpf v2 0/5] Fix bugs found by ASAN when running selftests Xu Kuohai
2022-10-10 7:04 ` [PATCH bpf v2 1/5] libbpf: Fix use-after-free in btf_dump_name_dups Xu Kuohai
2022-10-10 7:04 ` [PATCH bpf v2 2/5] libbpf: Fix memory leak in parse_usdt_arg() Xu Kuohai
2022-10-10 7:04 ` [PATCH bpf v2 3/5] selftests/bpf: Fix memory leak caused by not destroying skeleton Xu Kuohai
2022-10-10 7:04 ` Xu Kuohai [this message]
2022-10-10 7:04 ` [PATCH bpf v2 5/5] selftest/bpf: Fix error usage of ASSERT_OK in xdp_adjust_tail.c Xu Kuohai
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=20221010070454.577433-5-xukuohai@huaweicloud.com \
--to=xukuohai@huaweicloud.com \
--cc=9erthalion6@gmail.com \
--cc=alan.maguire@oracle.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=haoluo@google.com \
--cc=hawk@kernel.org \
--cc=houtao1@huawei.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=lorenzo@kernel.org \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=song@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).