bpf, x86: Mask the shift counts of the magic number division
Subsystems (3)
Daniel Borkmann
maintainerPATCH 1/1 bpf, x86: Mask the shift counts of the magic number division
The kernel test robot reports for a clang 22 randconfig with UBSAN and ThinLTO:
vmlinux.o: error: objtool: do_jit(): unexpected end of section .text.do_jit
Fix by masking the counts to their range like rol64() does, which keeps the shifts defined for the sanitizer and removes the __ubsan_handle_shift_out_of_bounds() checks. The counts are below 32 and 64 anyway, so the emitted code does not change. Reproduced with clang 20 and the robot's config without LTO.
--- arch/x86/net/bpf_jit_comp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/net/bpf_jit_comp.c +2 -2
@@ -2080,7 +2080,7 @@ struct bpf_div_magic {*/ static void bpf_magic_udiv (u64 d,int lz,struct bpf_div_magic *mag) { -u64 mask = ~0ULL >> lz; +u64 mask = ~0ULL >> (lz &63 );u64 nc, delta, q1, r1, q2, r2;int p;
@@ -2200,7 +2200,7 @@ static bool emit_div_const(u8 **pprog, const struct bpf_insn *insn, u32 dst_reg)* the add sequence. */ if (mag.add && !(imm32 &1 )) { - pre =__ffs (imm32); + pre =__ffs (imm32) &31 ;bpf_magic_udiv (imm32 >> pre, pre, &mag);if (mag.add)return false;
Signature · 1 line
2.43.0
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 11 lines · On Sun, 18 Oct 2026 13:33:52 +0200 you wrote:
The kernel test robot reports for a clang 22 randconfig with UBSAN and ThinLTO:
vmlinux.o: error: objtool:
do_jit(): unexpected end of section .text.do_jitFix by masking the counts to their range like
rol64()does, which keeps the shifts defined for the sanitizer and removes the__ubsan_handle_shift_out_of_bounds()checks. The counts are below 32 and 64 anyway, so the emitted code does not change. Reproduced with clang 20 and the robot's config without LTO.[...]
Here is the summary with links:
- [bpf-next] bpf, x86: Mask the shift counts of the magic number division
https://git.kernel.org/bpf/bpf-next/c/73a5accbfd21
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html