Skip to contentSkip to conversation

libbpf: Fix for the potential undefined behavior due to shifting

PATCH Applied Tw 2 participants 2 messages Aug 28

Subsystems (4)
lore
Share & tools
lore

Tw

author
#0 lore raw

PATCH v4 1/1 libbpf: Fix for the potential undefined behavior due to shifting

When compiling libbpf with sanitation, ubsan will report the following:

```
left shift of 1 by 31 places cannot be represented in type 'int'
```

This may lead to undefined behavior according to the compiler implementation, let's fix it by casting to unsigned counterpart before shifting.

---
v4:
- Fix macro redefined issue in test_btf.h
- Fix a typo in commit message

 tools/lib/bpf/libbpf.c                 | 2 +-
 tools/lib/bpf/libbpf_internal.h        | 4 ++--
 tools/testing/selftests/bpf/test_btf.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
tools/lib/bpf/libbpf.c +1 -1
index b749c0174..f09cbfd8e 100644
@@ -11738,7 +11738,7 @@ static int perf_event_open_probe(bool uprobe, bool retprobe, const char *name,
 				errstr(bit));
 			return bit;
 		}
-		attr.config |= 1 << bit;
+		attr.config |= 1ULL << bit;
 	}
 	attr.size = attr_sz;
 	attr.type = type;
tools/lib/bpf/libbpf_internal.h +2 -2
index 4c46d34fc..cb4d96233 100644
@@ -77,7 +77,7 @@
 #define JUMPTABLES_SEC ".jumptables"
 
 #define BTF_INFO_ENC(kind, kind_flag, vlen) \
-	((!!(kind_flag) << 31) | ((kind) << 24) | ((vlen) & BTF_MAX_VLEN))
+	(((__u32)(!!(kind_flag)) << 31) | ((kind) << 24) | ((vlen) & BTF_MAX_VLEN))
 #define BTF_TYPE_ENC(name, info, size_or_type) (name), (info), (size_or_type)
 #define BTF_INT_ENC(encoding, bits_offset, nr_bits) \
 	((encoding) << 24 | (bits_offset) << 16 | (nr_bits))
@@ -259,7 +259,7 @@ static inline enum btf_func_linkage btf_func_linkage(const struct btf_type *t)
 
 static inline __u32 btf_type_info(int kind, int vlen, int kflag)
 {
-	return (kflag << 31) | (kind << 24) | vlen;
+	return ((__u32)kflag << 31) | (kind << 24) | vlen;
 }
 
 enum map_def_parts {
tools/testing/selftests/bpf/test_btf.h +1 -1
index e65889ab4..e7bc78108 100644
@@ -7,7 +7,7 @@
 #define BTF_END_RAW 0xdeadbeef
 
 #define BTF_INFO_ENC(kind, kind_flag, vlen)			\
-	((!!(kind_flag) << 31) | ((kind) << 24) | ((vlen) & BTF_MAX_VLEN))
+	(((__u32)(!!(kind_flag)) << 31) | ((kind) << 24) | ((vlen) & BTF_MAX_VLEN))
 
 #define BTF_TYPE_ENC(name, info, size_or_type)	\
 	(name), (info), (size_or_type)
Signature · 1 line
2.54.0
#1 lore raw
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Quoted 8 lines · On Fri, 28 Aug 2026 08:34:10 +0800 you wrote:

When compiling libbpf with sanitation, ubsan will report the following:

```
left shift of 1 by 31 places cannot be represented in type 'int'
```

This may lead to undefined behavior according to the compiler implementation, let's fix it by casting to unsigned counterpart before shifting.

[...]

Here is the summary with links:
- [v4] libbpf: Fix for the potential undefined behavior due to shifting

    https://git.kernel.org/bpf/bpf-next/c/cd35e1b10182

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html