Commit 3908fcdd authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Alexei Starovoitov
Browse files

bpf: fix lsm_cgroup build errors on esoteric configs 



This particular ones is about having the following:
 CONFIG_BPF_LSM=y
 # CONFIG_CGROUP_BPF is not set

Also, add __maybe_unused to the args for the !CONFIG_NET cases.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/r/20220714185404.3647772-1-sdf@google.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent ab850abb

kernel/bpf/bpf_lsm.c

+6 −2
Original line number Diff line number Diff line
@@ -63,10 +63,11 @@ BTF_ID(func, bpf_lsm_socket_post_create) 
BTF_ID(func, bpf_lsm_socket_socketpair)

BTF_SET_END(bpf_lsm_unlocked_sockopt_hooks)



#ifdef CONFIG_CGROUP_BPF

void bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog,

			     bpf_func_t *bpf_func)

{

	const struct btf_param *args;

	const struct btf_param *args __maybe_unused;



	if (btf_type_vlen(prog->aux->attach_func_proto) < 1 ||

	    btf_id_set_contains(&bpf_lsm_current_hooks,
@@ -75,9 +76,9 @@ void bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog, 
		return;

	}



#ifdef CONFIG_NET

	args = btf_params(prog->aux->attach_func_proto);



#ifdef CONFIG_NET

	if (args[0].type == btf_sock_ids[BTF_SOCK_TYPE_SOCKET])

		*bpf_func = __cgroup_bpf_run_lsm_socket;

	else if (args[0].type == btf_sock_ids[BTF_SOCK_TYPE_SOCK])
@@ -86,6 +87,7 @@ void bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog, 
#endif

		*bpf_func = __cgroup_bpf_run_lsm_current;

}

#endif



int bpf_lsm_verify_prog(struct bpf_verifier_log *vlog,

			const struct bpf_prog *prog)
@@ -219,6 +221,7 @@ bpf_lsm_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
	case BPF_FUNC_get_retval:

		return prog->expected_attach_type == BPF_LSM_CGROUP ?

			&bpf_get_retval_proto : NULL;

#ifdef CONFIG_NET

	case BPF_FUNC_setsockopt:

		if (prog->expected_attach_type != BPF_LSM_CGROUP)

			return NULL;
@@ -239,6 +242,7 @@ bpf_lsm_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
					prog->aux->attach_btf_id))

			return &bpf_unlocked_sk_getsockopt_proto;

		return NULL;

#endif

	default:

		return tracing_prog_func_proto(func_id, prog);

	}

kernel/bpf/trampoline.c

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ int bpf_trampoline_unlink_prog(struct bpf_tramp_link *link, struct bpf_trampolin 
	return err;

}



#if defined(CONFIG_BPF_JIT) && defined(CONFIG_BPF_SYSCALL)

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

static void bpf_shim_tramp_link_release(struct bpf_link *link)

{

	struct bpf_shim_tramp_link *shim_link =