netdev - Re: [PATCH bpf-next] bpf: Fix build without BPF

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <3669E0C5-8982-465C-8C33-87015F4D970D@fb.com>
Date:   Mon, 31 Aug 2020 17:24:38 +0000
From:   Song Liu <songliubraving@...com>
To:     Alexei Starovoitov <alexei.starovoitov@...il.com>
CC:     "David S. Miller" <davem@...emloft.net>,
        Daniel Borkmann <daniel@...earbox.net>,
        Björn Töpel <bjorn.topel@...il.com>,
        Networking <netdev@...r.kernel.org>,
        "bpf@...r.kernel.org" <bpf@...r.kernel.org>,
        Kernel Team <Kernel-team@...com>
Subject: Re: [PATCH bpf-next] bpf: Fix build without BPF_LSM.



> On Aug 31, 2020, at 9:31 AM, Alexei Starovoitov <alexei.starovoitov@...il.com> wrote:
> 
> From: Alexei Starovoitov <ast@...nel.org>
> 
> resolve_btfids doesn't like empty set. Add unused ID when BPF_LSM is off.
> 
> Reported-by: Björn Töpel <bjorn.topel@...il.com>
> Fixes: 1e6c62a88215 ("bpf: Introduce sleepable BPF programs")
> Signed-off-by: Alexei Starovoitov <ast@...nel.org>

Thanks for the fix!

Tested-by: Song Liu <songliubraving@...com>


> ---
> kernel/bpf/verifier.c | 2 ++
> 1 file changed, 2 insertions(+)
> 
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index 3ebfdb7bd427..b4c22b5ce5a2 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -11008,6 +11008,8 @@ BTF_SET_START(btf_sleepable_lsm_hooks)
> #ifdef CONFIG_BPF_LSM
> BTF_ID(func, bpf_lsm_file_mprotect)
> BTF_ID(func, bpf_lsm_bprm_committed_creds)
> +#else
> +BTF_ID_UNUSED
> #endif
> BTF_SET_END(btf_sleepable_lsm_hooks)
> 
> -- 
> 2.23.0
>