2020-09-03 20:38:14

by Andrii Nakryiko

Subject: Re: [PATCH] selftests/bpf: Fix check in global_data_init.

On Thu, Sep 3, 2020 at 1:06 PM Hao Luo <[email protected]> wrote:
>
> The returned value of bpf_object__open_file() should be checked with
> libbpf_get_error() rather than NULL. This fix prevents test_progs from
> crash when test_global_data.o is not present.
>
> Signed-off-by: Hao Luo <[email protected]>
> ---

thanks!

Acked-by: Andrii Nakryiko <[email protected]>

> tools/testing/selftests/bpf/prog_tests/global_data_init.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/global_data_init.c b/tools/testing/selftests/bpf/prog_tests/global_data_init.c
> index 3bdaa5a40744..ee46b11f1f9a 100644
> --- a/tools/testing/selftests/bpf/prog_tests/global_data_init.c
> +++ b/tools/testing/selftests/bpf/prog_tests/global_data_init.c
> @@ -12,7 +12,8 @@ void test_global_data_init(void)
> size_t sz;
>
> obj = bpf_object__open_file(file, NULL);
> - if (CHECK_FAIL(!obj))
> + err = libbpf_get_error(obj);
> + if (CHECK_FAIL(err))
> return;
>
> map = bpf_object__find_map_by_name(obj, "test_glo.rodata");
> --
> 2.28.0.526.ge36021eeef-goog
>

2020-09-04 00:35:59

by Alexei Starovoitov

Subject: Re: [PATCH] selftests/bpf: Fix check in global_data_init.

On Thu, Sep 3, 2020 at 1:36 PM Andrii Nakryiko
<[email protected]> wrote:
>
> On Thu, Sep 3, 2020 at 1:06 PM Hao Luo <[email protected]> wrote:
> >
> > The returned value of bpf_object__open_file() should be checked with
> > libbpf_get_error() rather than NULL. This fix prevents test_progs from
> > crash when test_global_data.o is not present.
> >
> > Signed-off-by: Hao Luo <[email protected]>
> > ---
>
> thanks!
>
> Acked-by: Andrii Nakryiko <[email protected]>

Applied. Thanks