* [PATCH bpf-next] selftests/bpf: fix two memory leaks in prog_tests
@ 2022-04-28 22:57 Mykola Lysenko
2022-04-29 5:00 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Mykola Lysenko @ 2022-04-28 22:57 UTC (permalink / raw)
To: bpf, ast, andrii, daniel; +Cc: kernel-team, Mykola Lysenko
Fix log_fp memory leak in dispatch_thread_read_log.
Remove obsolete log_fp clean-up code in dispatch_thread.
Also, release memory of subtest_selector. This can be
reproduced with -n 2/1 parameters.
Signed-off-by: Mykola Lysenko <mykolal@fb.com>
---
tools/testing/selftests/bpf/test_progs.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 22fe283710fa..a07da648af3b 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -77,10 +77,12 @@ static void stdio_restore_cleanup(void)
if (env.subtest_state) {
fclose(env.subtest_state->stdout);
+ env.subtest_state->stdout = NULL;
stdout = env.test_state->stdout;
stderr = env.test_state->stdout;
} else {
fclose(env.test_state->stdout);
+ env.test_state->stdout = NULL;
}
#endif
}
@@ -1077,6 +1079,7 @@ static int read_prog_test_msg(int sock_fd, struct msg *msg, enum msg_type type)
static int dispatch_thread_read_log(int sock_fd, char **log_buf, size_t *log_cnt)
{
FILE *log_fp = NULL;
+ int result = 0;
log_fp = open_memstream(log_buf, log_cnt);
if (!log_fp)
@@ -1085,16 +1088,20 @@ static int dispatch_thread_read_log(int sock_fd, char **log_buf, size_t *log_cnt
while (true) {
struct msg msg;
- if (read_prog_test_msg(sock_fd, &msg, MSG_TEST_LOG))
- return 1;
+ if (read_prog_test_msg(sock_fd, &msg, MSG_TEST_LOG)) {
+ result = 1;
+ goto out;
+ }
fprintf(log_fp, "%s", msg.test_log.log_buf);
if (msg.test_log.is_last)
break;
}
+
+out:
fclose(log_fp);
log_fp = NULL;
- return 0;
+ return result;
}
static int dispatch_thread_send_subtests(int sock_fd, struct test_state *state)
@@ -1132,7 +1139,6 @@ static void *dispatch_thread(void *ctx)
{
struct dispatch_data *data = ctx;
int sock_fd;
- FILE *log_fp = NULL;
sock_fd = data->sock_fd;
@@ -1214,8 +1220,6 @@ static void *dispatch_thread(void *ctx)
if (env.debug)
fprintf(stderr, "[%d]: Protocol/IO error: %s.\n", data->worker_id, strerror(errno));
- if (log_fp)
- fclose(log_fp);
done:
{
struct msg msg_exit;
@@ -1685,6 +1689,7 @@ int main(int argc, char **argv)
unload_bpf_testmod();
free_test_selector(&env.test_selector);
+ free_test_selector(&env.subtest_selector);
free_test_states();
if (env.succ_cnt + env.fail_cnt + env.skip_cnt == 0)
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: fix two memory leaks in prog_tests
2022-04-28 22:57 [PATCH bpf-next] selftests/bpf: fix two memory leaks in prog_tests Mykola Lysenko
@ 2022-04-29 5:00 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-04-29 5:00 UTC (permalink / raw)
To: Mykola Lysenko; +Cc: bpf, ast, andrii, daniel, kernel-team
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:
On Thu, 28 Apr 2022 15:57:44 -0700 you wrote:
> Fix log_fp memory leak in dispatch_thread_read_log.
> Remove obsolete log_fp clean-up code in dispatch_thread.
>
> Also, release memory of subtest_selector. This can be
> reproduced with -n 2/1 parameters.
>
> Signed-off-by: Mykola Lysenko <mykolal@fb.com>
>
> [...]
Here is the summary with links:
- [bpf-next] selftests/bpf: fix two memory leaks in prog_tests
https://git.kernel.org/bpf/bpf-next/c/20b87e7c29df
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-29 5:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-28 22:57 [PATCH bpf-next] selftests/bpf: fix two memory leaks in prog_tests Mykola Lysenko
2022-04-29 5:00 ` patchwork-bot+netdevbpf
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).