Skip to contentSkip to conversation

libbpf: fix uninitialized variable in btf_parse_type_sec

PATCH Applied Andrii Nakryiko 3 participants 7 messages Sep 29, 2020 – Sep 30, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 libbpf: fix uninitialized variable in btf_parse_type_sec

Fix obvious unitialized variable use that wasn't reported by compiler. libbpf Makefile changes to catch such errors are added separately.

Fixes 3289959b97ca ("libbpf: Support BTF loading and raw data output in both endianness")
---
 tools/lib/bpf/btf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/btf.c +1 -1
index e1dbd766c698..398b1f345b3c 100644
@@ -347,7 +347,7 @@ static int btf_parse_type_sec(struct btf *btf)
 	struct btf_header *hdr = btf->hdr;
 	void *next_type = btf->types_data;
 	void *end_type = next_type + hdr->type_len;
-	int err, i, type_size;
+	int err, i = 0, type_size;
 
 	/* VOID (type_id == 0) is specially handled by btf__get_type_by_id(),
 	 * so ensure we can never properly use its offset from index by
Signature · 1 line
2.24.1
#1 lore raw

PATCH 2/3 libbpf: compile libbpf under -O2 level by default and catch extra warnings

For some reason compiler doesn't complain about uninitialized variable, fixed in previous patch, if libbpf is compiled without -O2 optimization level. So do compile it with -O2 and never let similar issue slip by again. -Wall is added unconditionally, so no need to specify it again.

---
 tools/lib/bpf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/Makefile +1 -1
index f43249696d9f..70cb44efe8cb 100644
@@ -98,7 +98,7 @@ PC_FILE		= libbpf.pc
 ifdef EXTRA_CFLAGS
   CFLAGS := $(EXTRA_CFLAGS)
 else
-  CFLAGS := -g -Wall
+  CFLAGS := -g -O2
 endif
 
 # Append required CFLAGS
Signature · 1 line
2.24.1
Acked-by on v1 2/3
#2 lore raw

Re: [PATCH bpf-next 2/3] libbpf: compile libbpf under -O2 level by default and catch extra warnings

Quoted 4 lines · Andrii Nakryiko

For some reason compiler doesn't complain about uninitialized variable, fixed in previous patch, if libbpf is compiled without -O2 optimization level. So do compile it with -O2 and never let similar issue slip by again. -Wall is added unconditionally, so no need to specify it again.

#3 lore raw

PATCH 3/3 libbpf: compile in PIC mode only for shared library case

In reply to Andrii Nakryiko

Libbpf compiles .o's for static and shared library modes separately, so no need to specify -fPIC for both. Keep it only for shared library mode.

---
 tools/lib/bpf/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
tools/lib/bpf/Makefile +1 -2
index 70cb44efe8cb..5f9abed3e226 100644
@@ -104,13 +104,12 @@ endif
 # Append required CFLAGS
 override CFLAGS += $(EXTRA_WARNINGS) -Wno-switch-enum
 override CFLAGS += -Werror -Wall
-override CFLAGS += -fPIC
 override CFLAGS += $(INCLUDES)
 override CFLAGS += -fvisibility=hidden
 override CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 
 # flags specific for shared library
-SHLIB_FLAGS := -DSHARED
+SHLIB_FLAGS := -DSHARED -fPIC
 
 ifeq ($(VERBOSE),1)
   Q =
Signature · 1 line
2.24.1
Acked-by on v1 3/3
#4 lore raw

Re: [PATCH bpf-next 3/3] libbpf: compile in PIC mode only for shared library case

Quoted 2 lines · Andrii Nakryiko

Libbpf compiles .o's for static and shared library modes separately, so no need to specify -fPIC for both. Keep it only for shared library mode.

#6 lore raw
In reply to Andrii Nakryiko
This series was applied to bpf/bpf-next.git (refs/heads/master):

Hello:

This series was applied to bpf/bpf-next.git (refs/heads/master):

Quoted 8 lines · On Tue, 29 Sep 2020 15:06:02 -0700 you wrote:

Fix obvious unitialized variable use that wasn't reported by compiler. libbpf Makefile changes to catch such errors are added separately.

Fixes 3289959b97ca ("libbpf: Support BTF loading and raw data output in both endianness")
---
 tools/lib/bpf/btf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Here is the summary with links:
- [bpf-next,1/3] libbpf: fix uninitialized variable in btf_parse_type_sec

    https://git.kernel.org/bpf/bpf-next/c/33433913459a
  - [bpf-next,2/3] libbpf: compile libbpf under -O2 level by default and catch extra warnings
    https://git.kernel.org/bpf/bpf-next/c/0a62291d697f
  - [bpf-next,3/3] libbpf: compile in PIC mode only for shared library case
    https://git.kernel.org/bpf/bpf-next/c/b0efc216f577

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html