qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libbpf: Fix logic for finding matching program for CO-RE relocation 

Bugzilla: https://bugzilla.redhat.com/2120968

commit 966a7509325395c51c5f6d89e7352b0585e4804b
Author: Andrii Nakryiko <andrii@kernel.org>
Date:   Mon Apr 25 17:45:04 2022 -0700

    libbpf: Fix logic for finding matching program for CO-RE relocation
    
    Fix the bug in bpf_object__relocate_core() which can lead to finding
    invalid matching BPF program when processing CO-RE relocation. IF
    matching program is not found, last encountered program will be assumed
    to be correct program and thus error detection won't detect the problem.
    
    Fixes: 9c82a63cf3 ("libbpf: Fix CO-RE relocs against .text section")
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Link: https://lore.kernel.org/bpf/20220426004511.2691730-4-andrii@kernel.org

Signed-off-by: Yauheni Kaliuta <ykaliuta@redhat.com>
This commit is contained in:
Yauheni Kaliuta 2022-10-06 13:52:32 +03:00
parent 6b18786dec
commit bc1ca1a959
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/lib/bpf/libbpf.c
View File

@ -5677,9 +5677,10 @@ bpf_object__relocate_core(struct bpf_object *obj, const char *targ_btf_path)
*/
prog = NULL;
for (i = 0; i < obj->nr_programs; i++) {
prog = &obj->programs[i];
if (strcmp(prog->sec_name, sec_name) == 0)
if (strcmp(obj->programs[i].sec_name, sec_name) == 0) {
prog = &obj->programs[i];
break;
}
}
if (!prog) {
pr_warn("sec '%s': failed to find a BPF program\n", sec_name);