]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
libbpf: Use proper errno value in linker
authorAnton Protopopov <a.s.protopopov@gmail.com>
Wed, 30 Apr 2025 12:08:20 +0000 (12:08 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:07:10 +0000 (11:07 +0100)
[ Upstream commit 358b1c0f56ebb6996fcec7dcdcf6bae5dcbc8b6c ]

Return values of the linker_append_sec_data() and the
linker_append_elf_relos() functions are propagated all the
way up to users of libbpf API. In some error cases these
functions return -1 which will be seen as -EPERM from user's
point of view. Instead, return a more reasonable -EINVAL.

Fixes: faf6ed321cf6 ("libbpf: Add BPF static linker APIs")
Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20250430120820.2262053-1-a.s.protopopov@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/lib/bpf/linker.c

index 752ef88c9fd97819df9ebde84ff3688645308e3a..0bee018a6a6c0e55375c5938be0fb2c4099374c5 100644 (file)
@@ -1175,7 +1175,7 @@ static int linker_append_sec_data(struct bpf_linker *linker, struct src_obj *obj
                } else {
                        if (!secs_match(dst_sec, src_sec)) {
                                pr_warn("ELF sections %s are incompatible\n", src_sec->sec_name);
-                               return -1;
+                               return -EINVAL;
                        }
 
                        /* "license" and "version" sections are deduped */
@@ -2023,7 +2023,7 @@ static int linker_append_elf_relos(struct bpf_linker *linker, struct src_obj *ob
                        }
                } else if (!secs_match(dst_sec, src_sec)) {
                        pr_warn("sections %s are not compatible\n", src_sec->sec_name);
-                       return -1;
+                       return -EINVAL;
                }
 
                /* add_dst_sec() above could have invalidated linker->secs */