linux-kernel - Re: linux-next: Tree for May 18 (kernel/bpf/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: <f6473baa-f526-6f5b-eb9d-7db657515a2b@infradead.org>
Date:   Tue, 25 May 2021 12:01:26 -0700
From:   Randy Dunlap <rdunlap@...radead.org>
To:     Daniel Borkmann <daniel@...earbox.net>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        bpf <bpf@...r.kernel.org>, Alexei Starovoitov <ast@...nel.org>,
        Andrii Nakryiko <andrii@...nel.org>
Subject: Re: linux-next: Tree for May 18 (kernel/bpf/bpf_lsm.o)

On 5/25/21 11:31 AM, Daniel Borkmann wrote:
> Hi Randy,
> 
> On 5/25/21 8:26 PM, Daniel Borkmann wrote:
>> On 5/25/21 7:30 PM, Randy Dunlap wrote:
>>> On 5/18/21 10:02 AM, Randy Dunlap wrote:
>>>> On 5/18/21 2:27 AM, Stephen Rothwell wrote:
>>>>> Hi all,
>>>>>
>>>>> Changes since 20210514:
>>>>>
>>>>
>>>> on i386:
>>>> # CONFIG_NET is not set
>>>>
>>>> ld: kernel/bpf/bpf_lsm.o: in function `bpf_lsm_func_proto':
>>>> bpf_lsm.c:(.text+0x1a0): undefined reference to `bpf_sk_storage_get_proto'
>>>> ld: bpf_lsm.c:(.text+0x1b8): undefined reference to `bpf_sk_storage_delete_proto'
>>>>
>>>>
>>>> Full randconfig file is attached.
>>>>
>>>
>>> Hi,
>>> I am still seeing this build error in linux-next-20210525.
>>
>> Will take a look and get back.
> 
> This should resolve it:

Acked-by: Randy Dunlap <rdunlap@...radead.org> # build-tested


Thanks.

> 
> diff --git a/kernel/bpf/bpf_lsm.c b/kernel/bpf/bpf_lsm.c
> index 5efb2b24012c..da471bf01b97 100644
> --- a/kernel/bpf/bpf_lsm.c
> +++ b/kernel/bpf/bpf_lsm.c
> @@ -107,10 +107,12 @@ bpf_lsm_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
>         return &bpf_inode_storage_get_proto;
>     case BPF_FUNC_inode_storage_delete:
>         return &bpf_inode_storage_delete_proto;
> +#ifdef CONFIG_NET
>     case BPF_FUNC_sk_storage_get:
>         return &bpf_sk_storage_get_proto;
>     case BPF_FUNC_sk_storage_delete:
>         return &bpf_sk_storage_delete_proto;
> +#endif /* CONFIG_NET */
>     case BPF_FUNC_spin_lock:
>         return &bpf_spin_lock_proto;
>     case BPF_FUNC_spin_unlock:


-- 
~Randy