0c1a912a36
backport-libbpf-Fix-NULL-pointer-dereference-in_bpf_object__c.patch backport-libbpf-Fix-str_has_sfxs-return-value.patch backport-libbpf-Initialize-err-in-probe_map_create.patch (cherry picked from commit e55c477544ff210c205ad481d168cd7a30ad43ad)
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From bd1e5cff31d49a9b4beb293a8d96b609cd535fb7 Mon Sep 17 00:00:00 2001
|
|
From: Florian Fainelli <f.fainelli@gmail.com>
|
|
Date: Sun, 31 Jul 2022 19:51:09 -0700
|
|
Subject: [PATCH] libbpf: Initialize err in probe_map_create
|
|
|
|
GCC-11 warns about the possibly unitialized err variable in
|
|
probe_map_create:
|
|
|
|
libbpf_probes.c: In function 'probe_map_create':
|
|
libbpf_probes.c:361:38: error: 'err' may be used uninitialized in this function [-Werror=maybe-uninitialized]
|
|
361 | return fd < 0 && err == exp_err ? 1 : 0;
|
|
| ~~~~^~~~~~~~~~
|
|
|
|
Fixes: 878d8def0603 ("libbpf: Rework feature-probing APIs")
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
|
|
Acked-by: Jiri Olsa <jolsa@kernel.org>
|
|
Link: https://lore.kernel.org/bpf/20220801025109.1206633-1-f.fainelli@gmail.com
|
|
---
|
|
src/libbpf_probes.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libbpf_probes.c b/src/libbpf_probes.c
|
|
index 0b5398786..6d495656f 100644
|
|
--- a/src/libbpf_probes.c
|
|
+++ b/src/libbpf_probes.c
|
|
@@ -193,7 +193,7 @@ static int probe_map_create(enum bpf_map_type map_type)
|
|
LIBBPF_OPTS(bpf_map_create_opts, opts);
|
|
int key_size, value_size, max_entries;
|
|
__u32 btf_key_type_id = 0, btf_value_type_id = 0;
|
|
- int fd = -1, btf_fd = -1, fd_inner = -1, exp_err = 0, err;
|
|
+ int fd = -1, btf_fd = -1, fd_inner = -1, exp_err = 0, err = 0;
|
|
|
|
opts.map_ifindex = ifindex;
|
|
|