Skip to content

Commit fdad456

Browse files
AsphalttAlexei Starovoitov
authored andcommitted
bpf: Fix updating attached freplace prog in prog_array map
The commit f7866c3 ("bpf: Fix null pointer dereference in resolve_prog_type() for BPF_PROG_TYPE_EXT") fixed a NULL pointer dereference panic, but didn't fix the issue that fails to update attached freplace prog to prog_array map. Since commit 1c123c5 ("bpf: Resolve fext program type when checking map compatibility"), freplace prog and its target prog are able to tail call each other. And the commit 3aac1ea ("bpf: Move prog->aux->linked_prog and trampoline into bpf_link on attach") sets prog->aux->dst_prog as NULL after attaching freplace prog to its target prog. After loading freplace the prog_array's owner type is BPF_PROG_TYPE_SCHED_CLS. Then, after attaching freplace its prog->aux->dst_prog is NULL. Then, while updating freplace in prog_array the bpf_prog_map_compatible() incorrectly returns false because resolve_prog_type() returns BPF_PROG_TYPE_EXT instead of BPF_PROG_TYPE_SCHED_CLS. After this patch the resolve_prog_type() returns BPF_PROG_TYPE_SCHED_CLS and update to prog_array can succeed. Fixes: f7866c3 ("bpf: Fix null pointer dereference in resolve_prog_type() for BPF_PROG_TYPE_EXT") Cc: Toke Høiland-Jørgensen <toke@redhat.com> Cc: Martin KaFai Lau <martin.lau@kernel.org> Acked-by: Yonghong Song <yonghong.song@linux.dev> Signed-off-by: Leon Hwang <leon.hwang@linux.dev> Link: https://lore.kernel.org/r/20240728114612.48486-2-leon.hwang@linux.dev Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent d74da84 commit fdad456

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

include/linux/bpf_verifier.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,8 +856,8 @@ static inline u32 type_flag(u32 type)
856856
/* only use after check_attach_btf_id() */
857857
static inline enum bpf_prog_type resolve_prog_type(const struct bpf_prog *prog)
858858
{
859-
return (prog->type == BPF_PROG_TYPE_EXT && prog->aux->dst_prog) ?
860-
prog->aux->dst_prog->type : prog->type;
859+
return (prog->type == BPF_PROG_TYPE_EXT && prog->aux->saved_dst_prog_type) ?
860+
prog->aux->saved_dst_prog_type : prog->type;
861861
}
862862

863863
static inline bool bpf_prog_check_recur(const struct bpf_prog *prog)

0 commit comments

Comments
 (0)