From: Andrii Nakryiko <andrii@kernel.org>
To: <bpf@vger.kernel.org>, <ast@kernel.org>, <daniel@iogearbox.net>
Cc: <andrii@kernel.org>, <kernel-team@fb.com>,
Hengqi Chen <hengqi.chen@gmail.com>
Subject: [PATCH v4 bpf-next 5/9] selftests/bpf: free inner strings index in btf selftest
Date: Sun, 7 Nov 2021 08:55:17 -0800 [thread overview]
Message-ID: <20211107165521.9240-6-andrii@kernel.org> (raw)
In-Reply-To: <20211107165521.9240-1-andrii@kernel.org>
Inner array of allocated strings wasn't freed on success. Now it's
always freed.
Reviewed-by: Hengqi Chen <hengqi.chen@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
tools/testing/selftests/bpf/prog_tests/btf.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c
index ac596cb06e40..ebd1aa4d09d6 100644
--- a/tools/testing/selftests/bpf/prog_tests/btf.c
+++ b/tools/testing/selftests/bpf/prog_tests/btf.c
@@ -4046,11 +4046,9 @@ static void *btf_raw_create(const struct btf_header *hdr,
next_str_idx < strs_cnt ? strs_idx[next_str_idx] : NULL;
done:
+ free(strs_idx);
if (err) {
- if (raw_btf)
- free(raw_btf);
- if (strs_idx)
- free(strs_idx);
+ free(raw_btf);
return NULL;
}
return raw_btf;
--
2.30.2
next prev parent reply other threads:[~2021-11-07 16:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-07 16:55 [PATCH v4 bpf-next 0/9] Fix leaks in libbpf and selftests Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 1/9] selftests/bpf: pass sanitizer flags to linker through LDFLAGS Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 2/9] libbpf: free up resources used by inner map definition Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 3/9] selftests/bpf: fix memory leaks in btf_type_c_dump() helper Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 4/9] selftests/bpf: free per-cpu values array in bpf_iter selftest Andrii Nakryiko
2021-11-07 16:55 ` Andrii Nakryiko [this message]
2021-11-07 16:55 ` [PATCH v4 bpf-next 6/9] selftests/bpf: clean up btf and btf_dump in dump_datasec test Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 7/9] selftests/bpf: avoid duplicate btf__parse() call Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 8/9] selftests/bpf: destroy XDP link correctly Andrii Nakryiko
2021-11-07 16:55 ` [PATCH v4 bpf-next 9/9] selftests/bpf: fix bpf_object leak in skb_ctx selftest Andrii Nakryiko
2021-11-07 17:15 ` [PATCH v4 bpf-next 0/9] Fix leaks in libbpf and selftests 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=20211107165521.9240-6-andrii@kernel.org \
--to=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=hengqi.chen@gmail.com \
--cc=kernel-team@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.