| From 6347859abd847bc90967247ffd0527ef3885650f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 26 Oct 2021 16:34:09 +0200 |
| Subject: selftests/bpf: Fix fclose/pclose mismatch in test_progs |
| |
| From: Andrea Righi <andrea.righi@canonical.com> |
| |
| [ Upstream commit f48ad69097fe79d1de13c4d8fef556d4c11c5e68 ] |
| |
| Make sure to use pclose() to properly close the pipe opened by popen(). |
| |
| Fixes: 81f77fd0deeb ("bpf: add selftest for stackmap with BPF_F_STACK_BUILD_ID") |
| Signed-off-by: Andrea Righi <andrea.righi@canonical.com> |
| Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> |
| Reviewed-by: Shuah Khan <skhan@linuxfoundation.org> |
| Acked-by: Martin KaFai Lau <kafai@fb.com> |
| Link: https://lore.kernel.org/bpf/20211026143409.42666-1-andrea.righi@canonical.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/testing/selftests/bpf/test_progs.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c |
| index 48bbe8e0ce48d..4369bc46bf9c2 100644 |
| --- a/tools/testing/selftests/bpf/test_progs.c |
| +++ b/tools/testing/selftests/bpf/test_progs.c |
| @@ -289,7 +289,7 @@ int extract_build_id(char *build_id, size_t size) |
| |
| if (getline(&line, &len, fp) == -1) |
| goto err; |
| - fclose(fp); |
| + pclose(fp); |
| |
| if (len > size) |
| len = size; |
| @@ -298,7 +298,7 @@ int extract_build_id(char *build_id, size_t size) |
| free(line); |
| return 0; |
| err: |
| - fclose(fp); |
| + pclose(fp); |
| return -1; |
| } |
| |
| -- |
| 2.33.0 |
| |
