| Message ID | 20211026143409.42666-1-andrea.righi@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f48ad69097fe79d1de13c4d8fef556d4c11c5e68 |
| Headers | show |
| Series | selftests/bpf: fix fclose/pclose mismatch | expand |
On 10/26/21 8:34 AM, Andrea Righi wrote: > 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> > --- > 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 cc1cd240445d..e3fea6f281e4 100644 > --- a/tools/testing/selftests/bpf/test_progs.c > +++ b/tools/testing/selftests/bpf/test_progs.c > @@ -370,7 +370,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; > @@ -379,7 +379,7 @@ int extract_build_id(char *build_id, size_t size) > free(line); > return 0; > err: > - fclose(fp); > + pclose(fp); > return -1; > } > > Thank you for the patch. The return logic could be simpler doing out handling common for error and success path with just one call to close. Not related to this change though. Adding bpf maintainers to the thread Reviewed-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
On Tue, Oct 26, 2021 at 10:47 AM Shuah Khan <skhan@linuxfoundation.org> wrote: > > On 10/26/21 8:34 AM, Andrea Righi wrote: > > 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> > > --- > > 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 cc1cd240445d..e3fea6f281e4 100644 > > --- a/tools/testing/selftests/bpf/test_progs.c > > +++ b/tools/testing/selftests/bpf/test_progs.c > > @@ -370,7 +370,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; > > @@ -379,7 +379,7 @@ int extract_build_id(char *build_id, size_t size) > > free(line); > > return 0; > > err: > > - fclose(fp); > > + pclose(fp); > > return -1; > > } > > > > > > Thank you for the patch. The return logic could be simpler > doing out handling common for error and success path with > just one call to close. Not related to this change though. > > Adding bpf maintainers to the thread Ohh. That's odd. I see the patch in: https://patchwork.kernel.org/project/netdevbpf/list/?delegate=121173 but not in my gmail. vger is probably slow.
On Tue, Oct 26, 2021 at 04:34:09PM +0200, Andrea Righi wrote: > Make sure to use pclose() to properly close the pipe opened by popen(). Acked-by: Martin KaFai Lau <kafai@fb.com>
Hello: This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <daniel@iogearbox.net>: On Tue, 26 Oct 2021 16:34:09 +0200 you wrote: > 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> > --- > tools/testing/selftests/bpf/test_progs.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Here is the summary with links: - selftests/bpf: fix fclose/pclose mismatch https://git.kernel.org/bpf/bpf-next/c/f48ad69097fe You are awesome, thank you!
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index cc1cd240445d..e3fea6f281e4 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -370,7 +370,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; @@ -379,7 +379,7 @@ int extract_build_id(char *build_id, size_t size) free(line); return 0; err: - fclose(fp); + pclose(fp); return -1; }
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> --- tools/testing/selftests/bpf/test_progs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)