bpf: Fix abs(INT_MIN) undefined behavior in interpreter sdiv/smod
Subsystems (4)
v4 cover bpf: Fix abs(INT_MIN) undefined behavior in interpreter sdiv/smod
The BPF interpreter's signed 32-bit division and modulo handlers use abs() on s32 operands, which is undefined for S32_MIN. This causes the interpreter to compute wrong results, creating a mismatch with the verifier's range tracking.
For example, INT_MIN / 2 returns 0x40000000 instead of the correct 0xC0000000. The verifier tracks the correct range, so a crafted BPF program can exploit the mismatch for out-of-bounds map value access (confirmed by KASAN).
Patch 1 introduces __safe_abs32() which handles S32_MIN correctly and replaces all 8 abs((s32)...) call sites.
Patch 2 adds selftests covering sdiv32 and smod32 with INT_MIN dividend to prevent regression.
Changes since v3:
- Fixed stray blank line deletion in the file header
- Improved __safe_abs32() comment per Yonghong Song's suggestion
- Added JIT vs interpreter context to selftest commit message per Yonghong Song's feedback
Changes since v2:
- Simplified __safe_abs32() to use -(u32)x instead of special-casing S32_MIN, per Mykyta Yatsenko's suggestion
Changes since v1:
- Moved __safe_abs32() helper above the kerneldoc comment block for ___bpf_prog_run() to fix build warnings reported by kernel test robot
Jenny Guanni Qu (2):
bpf: Fix undefined behavior in interpreter sdiv/smod for INT_MIN selftests/bpf: Add tests for sdiv32/smod32 with INT_MIN dividend
kernel/bpf/core.c | 22 ++++--- .../selftests/bpf/progs/verifier_sdiv.c | 58 +++++++++++++++++++ 2 files changed, 72 insertions(+), 8 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/2 bpf: Fix undefined behavior in interpreter sdiv/smod for INT_MIN
The BPF interpreter's signed 32-bit division and modulo handlers use the kernel abs() macro on s32 operands. The abs() macro documentation (include/linux/math.h) explicitly states the result is undefined when the input is the type minimum. When DST contains S32_MIN (0x80000000), abs((s32)DST) triggers undefined behavior and returns S32_MIN unchanged on arm64/x86. This value is then sign-extended to u64 as 0xFFFFFFFF80000000, causing do_div() to compute the wrong result.
The verifier's abstract interpretation (scalar32_min_max_sdiv) computes the mathematically correct result for range tracking, creating a verifier/interpreter mismatch that can be exploited for out-of-bounds map value access.
Introduce __safe_abs32() which handles S32_MIN correctly by casting to u32 before negating, avoiding signed overflow entirely. Replace all 8 abs((s32)...) call sites in the interpreter's sdiv32/smod32 handlers.
--- kernel/bpf/core.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
kernel/bpf/core.c +14 -8
@@ -1736,6 +1736,12 @@ bool bpf_opcode_in_insntable(u8 code) }#ifndef CONFIG_BPF_JIT_ALWAYS_ON +/* Safe absolute value for s32 to prevent undefined behavior for abs(S32_MIN) */ +static inline u32 __safe_abs32 (s32 x) +{ +return x >=0 ? (u32 )x : -(u32 )x; +} +/** * ___bpf_prog_run - run eBPF program on a given context * @regs: is the array of MAX_BPF_EXT_REG eBPF pseudo-registers
@@ -1900,8 +1906,8 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn)DST =do_div (AX , (u32 )SRC );break ;case 1 : -AX =abs ((s32 )DST ); -AX =do_div (AX ,abs ((s32 )SRC )); +AX =__safe_abs32 ((s32 )DST ); +AX =do_div (AX ,__safe_abs32 ((s32 )SRC ));if ((s32 )DST <0 )DST = (u32)-AX ;else
@@ -1928,8 +1934,8 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn)DST =do_div (AX , (u32 )IMM );break ;case 1 : -AX =abs ((s32 )DST ); -AX =do_div (AX ,abs ((s32 )IMM )); +AX =__safe_abs32 ((s32 )DST ); +AX =do_div (AX ,__safe_abs32 ((s32 )IMM ));if ((s32 )DST <0 )DST = (u32)-AX ;else
@@ -1955,8 +1961,8 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn)DST = (u32 )AX ;break ;case 1 : -AX =abs ((s32 )DST ); -do_div (AX ,abs ((s32 )SRC )); +AX =__safe_abs32 ((s32 )DST ); +do_div (AX ,__safe_abs32 ((s32 )SRC ));if (((s32 )DST <0 ) == ((s32 )SRC <0 ))DST = (u32 )AX ;else
@@ -1982,8 +1988,8 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn)DST = (u32 )AX ;break ;case 1 : -AX =abs ((s32 )DST ); -do_div (AX ,abs ((s32 )IMM )); +AX =__safe_abs32 ((s32 )DST ); +do_div (AX ,__safe_abs32 ((s32 )IMM ));if (((s32 )DST <0 ) == ((s32 )IMM <0 ))DST = (u32 )AX ;else
Signature · 1 line
2.34.1
Re: [PATCH v4 1/2] bpf: Fix undefined behavior in interpreter sdiv/smod for INT_MIN
Quoted 18 lines · Jenny Guanni Qu
The BPF interpreter's signed 32-bit division and modulo handlers use the kernel
abs()macro on s32 operands. Theabs()macro documentation (include/linux/math.h) explicitly states the result is undefined when the input is the type minimum. When DST containsS32_MIN(0x80000000), abs((s32)DST) triggers undefined behavior and returnsS32_MINunchanged on arm64/x86. This value is then sign-extended to u64 as0xFFFFFFFF80000000, causingdo_div()to compute the wrong result.The verifier's abstract interpretation (
scalar32_min_max_sdiv) computes the mathematically correct result for range tracking, creating a verifier/interpreter mismatch that can be exploited for out-of-bounds map value access.Introduce
__safe_abs32()which handlesS32_MINcorrectly by casting to u32 before negating, avoiding signed overflow entirely. Replace all 8 abs((s32)...) call sites in the interpreter's sdiv32/smod32 handlers.
Quoted 7 lines
Fixes ec0e2da95f72 ("bpf: Support new signed div/mod instructions.")Acked-by Yonghong Song <[email protected]>Signed-off-by Jenny Guanni Qu <[email protected]>--- kernel/bpf/core.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
Quoted 61 lines
kernel/bpf/core.c +14
-8@@ -1736,6 +1736,12 @@ bool bpf_opcode_in_insntable(u8 code) }#ifndef CONFIG_BPF_JIT_ALWAYS_ON +/* Safe absolute value for s32 to prevent undefined behavior for abs(S32_MIN) */ +static inline u32 __safe_abs32 (s32 x) +{ +return x >=0 ? (u32 )x : -(u32 )x; +} +/** * ___bpf_prog_run - run eBPF program on a given context * @regs: is the array of MAX_BPF_EXT_REG eBPF pseudo-registers @@ -1900,8 +1906,8 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn)DST =do_div (AX , (u32 )SRC );break ;case 1 : -AX =abs ((s32 )DST ); -AX =do_div (AX ,abs ((s32 )SRC )); +AX =__safe_abs32 ((s32 )DST ); +AX =do_div (AX ,__safe_abs32 ((s32 )SRC ));if ((s32 )DST <0 )DST = (u32)-AX ;else @@ -1928,8 +1934,8 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn)DST =do_div (AX , (u32 )IMM );break ;case 1 : -AX =abs ((s32 )DST ); -AX =do_div (AX ,abs ((s32 )IMM )); +AX =__safe_abs32 ((s32 )DST ); +AX =do_div (AX ,__safe_abs32 ((s32 )IMM ));if ((s32 )DST <0 )DST = (u32)-AX ;else @@ -1955,8 +1961,8 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn)DST = (u32 )AX ;break ;case 1 : -AX =abs ((s32 )DST ); -do_div (AX ,abs ((s32 )SRC )); +AX =__safe_abs32 ((s32 )DST ); +do_div (AX ,__safe_abs32 ((s32 )SRC ));if (((s32 )DST <0 ) == ((s32 )SRC <0 ))DST = (u32 )AX ;else @@ -1982,8 +1988,8 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn)DST = (u32 )AX ;break ;case 1 : -AX =abs ((s32 )DST ); -do_div (AX ,abs ((s32 )IMM )); +AX =__safe_abs32 ((s32 )DST ); +do_div (AX ,__safe_abs32 ((s32 )IMM ));if (((s32 )DST <0 ) == ((s32 )IMM <0 ))DST = (u32 )AX ;else
Re: [PATCH v4 1/2] bpf: Fix undefined behavior in interpreter sdiv/smod for INT_MIN
In reply to Jenny Guanni QuQuoted 31 lines · Jenny Guanni Qu
The BPF interpreter's signed 32-bit division and modulo handlers use the kernel
abs()macro on s32 operands. Theabs()macro documentation (include/linux/math.h) explicitly states the result is undefined when the input is the type minimum. When DST containsS32_MIN(0x80000000), abs((s32)DST) triggers undefined behavior and returnsS32_MINunchanged on arm64/x86. This value is then sign-extended to u64 as0xFFFFFFFF80000000, causingdo_div()to compute the wrong result.The verifier's abstract interpretation (
scalar32_min_max_sdiv) computes the mathematically correct result for range tracking, creating a verifier/interpreter mismatch that can be exploited for out-of-bounds map value access.Introduce
__safe_abs32()which handlesS32_MINcorrectly by casting to u32 before negating, avoiding signed overflow entirely. Replace all 8 abs((s32)...) call sites in the interpreter's sdiv32/smod32 handlers.Fixes ec0e2da95f72 ("bpf: Support new signed div/mod instructions.")Acked-by Yonghong Song <[email protected]>Signed-off-by Jenny Guanni Qu <[email protected]>--- kernel/bpf/core.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)kernel/bpf/core.c +0
-0
kernel/bpf/core.c bool bpf_opcode_in_insntable(u8 code) · line 1740
Quoted 5 lines
kernel/bpf/core.c +2
-0@@ -1736,6 +1736,12 @@ bool bpf_opcode_in_insntable(u8 code) }#ifndef CONFIG_BPF_JIT_ALWAYS_ON +/* Safe absolute value for s32 to prevent undefined behavior for abs(S32_MIN) */ +static inline u32 __safe_abs32 (s32 x)
Double underscore is used for helpers when there is a similar helper without double underscore.
So pls rename this one to abs32() or abs_s32() and drop 'inline'.
s32 is the only case or there are more?
pw-bot: cr
PATCH v4 2/2 selftests/bpf: Add tests for sdiv32/smod32 with INT_MIN dividend
In reply to Jenny Guanni QuAdd tests to verify that signed 32-bit division and modulo operations produce correct results when the dividend is INT_MIN (0x80000000).
The bug fixed in the previous commit only affects the BPF interpreter path. When JIT is enabled (the default on most architectures), the native CPU division instruction produces the correct result and these tests pass regardless. With bpf_jit_enable=0, the interpreter is used and without the previous fix, INT_MIN / 2 incorrectly returns 0x40000000 instead of 0xC0000000 due to abs(S32_MIN) undefined behavior, causing these tests to fail.
Test cases:
- SDIV32 INT_MIN / 2 = -1073741824 (imm and reg divisor)
- SMOD32 INT_MIN % 2 = 0 (positive and negative divisor)
--- .../selftests/bpf/progs/verifier_sdiv.c | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+)
tools/testing/selftests/bpf/progs/verifier_sdiv.c +58 -0
@@ -1209,6 +1209,64 @@ __naked void smod32_ri_divisor_neg_1(void) : __clobber_all); } +SEC("socket") +__description("SDIV32, INT_MIN divided by 2, imm") +__success __success_unpriv __retval(-1073741824) +__naked void sdiv32_int_min_div_2_imm (void ) +{ + asmvolatile (" \ +w0 = %[int_min]; \ +w0 s/= 2; \ +exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +SEC("socket") +__description("SDIV32, INT_MIN divided by 2, reg") +__success __success_unpriv __retval(-1073741824) +__naked void sdiv32_int_min_div_2_reg (void ) +{ + asmvolatile (" \ +w0 = %[int_min]; \ +w1 = 2; \ +w0 s/= w1; \ +exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +SEC("socket") +__description("SMOD32, INT_MIN modulo 2, imm") +__success __success_unpriv __retval(0) +__naked void smod32_int_min_mod_2_imm(void) +{ + asmvolatile (" \ +w0 = %[int_min]; \ +w0 s%%= 2; \ +exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +SEC("socket") +__description("SMOD32, INT_MIN modulo -2, imm") +__success __success_unpriv __retval(0) +__naked void smod32_int_min_mod_neg2_imm(void) +{ + asmvolatile (" \ +w0 = %[int_min]; \ +w0 s%%= -2; \ +exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +#else SEC ("socket" )
Signature · 1 line
2.34.1
Re: [PATCH v4 2/2] selftests/bpf: Add tests for sdiv32/smod32 with INT_MIN dividend
Quoted 78 lines · Jenny Guanni Qu
Add tests to verify that signed 32-bit division and modulo operations produce correct results when the dividend is
INT_MIN(0x80000000).The bug fixed in the previous commit only affects the BPF interpreter path. When JIT is enabled (the default on most architectures), the native CPU division instruction produces the correct result and these tests pass regardless. With bpf_jit_enable=0, the interpreter is used and without the previous fix,
INT_MIN/ 2 incorrectly returns0x40000000instead of0xC0000000due toabs(S32_MIN)undefined behavior, causing these tests to fail.Test cases:
- SDIV32INT_MIN/ 2 = -1073741824 (imm and reg divisor)
- SMOD32INT_MIN% 2 = 0 (positive and negative divisor)Signed-off-by Jenny Guanni Qu <[email protected]>--- .../selftests/bpf/progs/verifier_sdiv.c | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+)tools/testing/selftests/bpf/progs/verifier_sdiv.c +50
-0@@ -1209,6 +1209,64 @@ __naked void smod32_ri_divisor_neg_1(void) : __clobber_all); } +SEC("socket") +__description("SDIV32, INT_MIN divided by 2, imm") +__success __success_unpriv __retval(-1073741824) +__naked void sdiv32_int_min_div_2_imm (void ) +{ + asmvolatile (" \ +w0 = %[int_min]; \ +w0 s/= 2; \ +exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +SEC("socket") +__description("SDIV32, INT_MIN divided by 2, reg") +__success __success_unpriv __retval(-1073741824) +__naked void sdiv32_int_min_div_2_reg (void ) +{ + asmvolatile (" \ +w0 = %[int_min]; \ +w1 = 2; \ +w0 s/= w1; \ +exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +SEC("socket") +__description("SMOD32, INT_MIN modulo 2, imm") +__success __success_unpriv __retval(0) +__naked void smod32_int_min_mod_2_imm(void) +{ + asmvolatile (" \ +w0 = %[int_min]; \ +w0 s%%= 2; \ +exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +SEC("socket") +__description("SMOD32, INT_MIN modulo -2, imm") +__success __success_unpriv __retval(0) +__naked void smod32_int_min_mod_neg2_imm(void) +{ + asm volatile (" \ + w0 = %[int_min]; \
tools/testing/selftests/bpf/progs/verifier_sdiv.c __naked void smod32_ri_divisor_neg_1(void) · line 1271
Quoted 10 lines
tools/testing/selftests/bpf/progs/verifier_sdiv.c +8
-0+ w0 s%%= -2; \ + exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +#else
Minor nits: extra blank line before #else, and smod32 tests only cover the imm form — a reg variant (w0 s%%= w1) would make coverage symmetric with sdiv32.
Neither worth a respin.
Quoted 1 line
tools/testing/selftests/bpf/progs/verifier_sdiv.c +0
-0SEC ("socket" )
Re: [PATCH v4 2/2] selftests/bpf: Add tests for sdiv32/smod32 with INT_MIN dividend
Quoted 84 lines · Jiayuan Chen
Quoted 82 lines · Jenny Guanni Qu
Add tests to verify that signed 32-bit division and modulo operations produce correct results when the dividend is
INT_MIN(0x80000000).The bug fixed in the previous commit only affects the BPF interpreter path. When JIT is enabled (the default on most architectures), the native CPU division instruction produces the correct result and these tests pass regardless. With bpf_jit_enable=0, the interpreter is used and without the previous fix,
INT_MIN/ 2 incorrectly returns0x40000000instead of0xC0000000due toabs(S32_MIN)undefined behavior, causing these tests to fail.Test cases:
- SDIV32INT_MIN/ 2 = -1073741824 (imm and reg divisor)
- SMOD32INT_MIN% 2 = 0 (positive and negative divisor)Signed-off-by Jenny Guanni Qu <[email protected]>---
.../selftests/bpf/progs/verifier_sdiv.c | 58 +++++++++++++++++++1 file changed, 58 insertions(+)tools/testing/selftests/bpf/progs/verifier_sdiv.c +54
-0@@ -1209,6 +1209,64 @@ __naked void smod32_ri_divisor_neg_1(void) : __clobber_all); } +SEC("socket") +__description("SDIV32, INT_MIN divided by 2, imm") +__success __success_unpriv __retval(-1073741824) +__naked void sdiv32_int_min_div_2_imm (void ) +{ + asm volatile (" \ + w0 = %[int_min]; \ + w0 s/= 2; \ + exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +SEC("socket") +__description("SDIV32, INT_MIN divided by 2, reg") +__success __success_unpriv __retval(-1073741824) +__naked void sdiv32_int_min_div_2_reg (void ) +{ + asm volatile (" \ +w0 = %[int_min]; \ +w1 = 2; \ +w0 s/= w1; \ +exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +SEC("socket") +__description("SMOD32, INT_MIN modulo 2, imm") +__success __success_unpriv __retval(0) +__naked void smod32_int_min_mod_2_imm(void) +{ + asm volatile (" \ + w0 = %[int_min]; \ + w0 s%%= 2; \ + exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all); +} + +SEC("socket") +__description("SMOD32, INT_MIN modulo -2, imm") +__success __success_unpriv __retval(0) +__naked void smod32_int_min_mod_neg2_imm(void) +{ + asm volatile (" \ + w0 = %[int_min]; \ + w0 s%%= -2; \ + exit; \ +" : + : __imm_const(int_min, INT_MIN) + : __clobber_all);
Quoted 8 lines
tools/testing/selftests/bpf/progs/verifier_sdiv.c __naked void smod32_ri_divisor_neg_1(void) · line 1270
Quoted 4 lines
tools/testing/selftests/bpf/progs/verifier_sdiv.c +3
-0+} + + #elseMinor nits: extra blank line before #else, and smod32 tests only cover the imm form — a reg variant (w0 s%%= w1) would make coverage symmetric with sdiv32.
Right, the committer should be able to remove the extra line.
Quoted 6 lines
Neither worth a respin.
Reviewed-by Jiayuan Chen <[email protected]>Quoted 1 line
tools/testing/selftests/bpf/progs/verifier_sdiv.c +0
-0SEC("socket")