Commit 43bf0878 authored by Yuntao Wang's avatar Yuntao Wang Committed by Andrii Nakryiko
Browse files

bpf: Remove unused parameter from find_kfunc_desc_btf() 



The func_id parameter in find_kfunc_desc_btf() is not used, get rid of it.

Fixes: 2357672c ("bpf: Introduce BPF support for kernel module function calls")
Signed-off-by: default avatarYuntao Wang <ytcoode@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Acked-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/bpf/20220505070114.3522522-1-ytcoode@gmail.com
parent 56c3e749

kernel/bpf/verifier.c

+4 −5
Original line number Diff line number Diff line
@@ -1815,8 +1815,7 @@ void bpf_free_kfunc_btf_tab(struct bpf_kfunc_btf_tab *tab) 
	kfree(tab);

}



static struct btf *find_kfunc_desc_btf(struct bpf_verifier_env *env,

				       u32 func_id, s16 offset)

static struct btf *find_kfunc_desc_btf(struct bpf_verifier_env *env, s16 offset)

{

	if (offset) {

		if (offset < 0) {
@@ -1891,7 +1890,7 @@ static int add_kfunc_call(struct bpf_verifier_env *env, u32 func_id, s16 offset) 
		prog_aux->kfunc_btf_tab = btf_tab;

	}



	desc_btf = find_kfunc_desc_btf(env, func_id, offset);

	desc_btf = find_kfunc_desc_btf(env, offset);

	if (IS_ERR(desc_btf)) {

		verbose(env, "failed to find BTF for kernel function\n");

		return PTR_ERR(desc_btf);
@@ -2360,7 +2359,7 @@ static const char *disasm_kfunc_name(void *data, const struct bpf_insn *insn) 
	if (insn->src_reg != BPF_PSEUDO_KFUNC_CALL)

		return NULL;



	desc_btf = find_kfunc_desc_btf(data, insn->imm, insn->off);

	desc_btf = find_kfunc_desc_btf(data, insn->off);

	if (IS_ERR(desc_btf))

		return "<error>";
@@ -7237,7 +7236,7 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, 
	if (!insn->imm)

		return 0;



	desc_btf = find_kfunc_desc_btf(env, insn->imm, insn->off);

	desc_btf = find_kfunc_desc_btf(env, insn->off);

	if (IS_ERR(desc_btf))

		return PTR_ERR(desc_btf);