Commit 9cb61fda authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Daniel Borkmann
Browse files

bpf: Fix bpf_trampoline_{,un}link_cgroup_shim ifdef guards 



They were updated in kernel/bpf/trampoline.c to fix another build
issue. We should to do the same for include/linux/bpf.h header.

Fixes: 3908fcdd ("bpf: fix lsm_cgroup build errors on esoteric configs")
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20220720155220.4087433-1-sdf@google.com
parent b77ffb30

include/linux/bpf.h

+7 −3
Original line number Diff line number Diff line
@@ -1254,9 +1254,6 @@ struct bpf_dummy_ops { 
int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,

			    union bpf_attr __user *uattr);

#endif

int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,

				    int cgroup_atype);

void bpf_trampoline_unlink_cgroup_shim(struct bpf_prog *prog);

#else

static inline const struct bpf_struct_ops *bpf_struct_ops_find(u32 type_id)

{
@@ -1280,6 +1277,13 @@ static inline int bpf_struct_ops_map_sys_lookup_elem(struct bpf_map *map, 
{

	return -EINVAL;

}

#endif



#if defined(CONFIG_CGROUP_BPF) && defined(CONFIG_BPF_LSM)

int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,

				    int cgroup_atype);

void bpf_trampoline_unlink_cgroup_shim(struct bpf_prog *prog);

#else

static inline int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,

						  int cgroup_atype)

{