Re: linux-next: Tree for May 18 (kernel/bpf/bpf_lsm.o)

[Daniel Borkmann]

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:

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: