netdev - Re: [PATCH] trace: Fix passing zero to 'PTR

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAEf4Bzan81+Go84k9fenKMixCthGzXZ6v27vTyqbkmBC1LLXyw@mail.gmail.com>
Date:   Fri, 6 Nov 2020 12:41:03 -0800
From:   Andrii Nakryiko <andrii.nakryiko@...il.com>
To:     Wang Qing <wangqing@...o.com>
Cc:     Steven Rostedt <rostedt@...dmis.org>,
        Ingo Molnar <mingo@...hat.com>,
        Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Martin KaFai Lau <kafai@...com>,
        Song Liu <songliubraving@...com>, Yonghong Song <yhs@...com>,
        Andrii Nakryiko <andrii@...nel.org>,
        John Fastabend <john.fastabend@...il.com>,
        KP Singh <kpsingh@...omium.org>,
        Networking <netdev@...r.kernel.org>, bpf <bpf@...r.kernel.org>,
        open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] trace: Fix passing zero to 'PTR_ERR' warning

On Fri, Nov 6, 2020 at 12:49 AM Wang Qing <wangqing@...o.com> wrote:
>
> Fix smatch warning.
>
> Signed-off-by: Wang Qing <wangqing@...o.com>
> ---
>  kernel/trace/bpf_trace.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
> index 4517c8b..2cb9c45
> --- a/kernel/trace/bpf_trace.c
> +++ b/kernel/trace/bpf_trace.c
> @@ -1198,7 +1198,7 @@ static int bpf_btf_printf_prepare(struct btf_ptr *ptr, u32 btf_ptr_size,
>         *btf = bpf_get_btf_vmlinux();
>
>         if (IS_ERR_OR_NULL(*btf))
> -               return PTR_ERR(*btf);
> +               return PTR_ERR_OR_ZERO(*btf);

Either way returns zero for error? Which is the actual bug, so I think
the proper fix is:

return *btf ? PTR_ERR(*btf) : -EINVAL;

Or something like that.

>
>         if (ptr->type_id > 0)
>                 *btf_id = ptr->type_id;
> --
> 2.7.4
>