bpf: Fix a verifier bug due to incorrect branch offset comparison with cpu=v4
Yonghong Song
reviewerPATCH v2 1/1 bpf: Fix a verifier bug due to incorrect branch offset comparison with cpu=v4
Bpf cpu=v4 support is introduced in [1] and Commit 4cd58e9af8b9 ("bpf: Support new 32bit offset jmp instruction") added support for new 32bit offset jmp instruction. Unfortunately, in function bpf_adj_delta_to_off(), for new branch insn with 32bit offset, the offset (plus/minor a small delta) compares to 16-bit offset bound [S16_MIN, S16_MAX], which caused the following verification failure:
$ ./test_progs-cpuv4 -t verif_scale_pyperf180 ... insn 10 cannot be patched due to 16-bit range ... libbpf: failed to load object 'pyperf180.bpf.o' scale_test:FAIL:expect_success unexpected error: -12 (errno 12) #405 verif_scale_pyperf180:FAIL
Note that due to recent llvm18 development, the patch [2] (already applied in bpf-next) needs to be applied to bpf tree for testing purpose.
The fix is rather simple. For 32bit offset branch insn, the adjusted offset compares to [S32_MIN, S32_MAX] and then verification succeeded.
[1] https://lore.kernel.org/all/[email protected]
[2] https://lore.kernel.org/bpf/[email protected]
--- kernel/bpf/core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
kernel/bpf/core.c +7 -4
@@ -371,14 +371,17 @@ static int bpf_adj_delta_to_imm(struct bpf_insn *insn, u32 pos, s32 end_old,static int bpf_adj_delta_to_off (struct bpf_insn *insn,u32 pos,s32 end_old,s32 end_new,s32 curr,const bool probe_pass) { -const s32 off_min =S16_MIN , off_max =S16_MAX ; +s64 off_min =S16_MIN , off_max =S16_MAX ;s32 delta = end_new - end_old; -s32 off; +s64 off; -if (insn->code == (BPF_JMP32 |BPF_JA )) +if (insn->code == (BPF_JMP32 |BPF_JA )) { off = insn->imm; -else + off_min =S32_MIN ; + off_max =S32_MAX ; + }else { off = insn->off; + }if (curr < pos && curr + off +1 >= end_old) off += delta;
Signature · 1 line
2.34.1
Quoted 41 lines · Yonghong Song
Bpf cpu=v4 support is introduced in [1] and Commit
4cd58e9af8b9("bpf: Support new 32bit offset jmp instruction") added support for new 32bit offset jmp instruction. Unfortunately, in functionbpf_adj_delta_to_off(), for new branch insn with 32bit offset, the offset (plus/minor a small delta) compares to 16-bit offset bound [S16_MIN,S16_MAX], which caused the following verification failure:$ ./test_progs-cpuv4 -t verif_scale_pyperf180 ... insn 10 cannot be patched due to 16-bit range ... libbpf: failed to load object 'pyperf180.bpf.o' scale_test:FAIL:expect_success unexpected error: -12 (errno 12) #405 verif_scale_pyperf180:FAILNote that due to recent llvm18 development, the patch [2] (already applied in bpf-next) needs to be applied to bpf tree for testing purpose.
The fix is rather simple. For 32bit offset branch insn, the adjusted offset compares to [
S32_MIN,S32_MAX] and then verification succeeded.[1] https://lore.kernel.org/all/[email protected]
[2] https://lore.kernel.org/bpf/[email protected]Fixes 4cd58e9af8b9 ("bpf: Support new 32bit offset jmp instruction")Signed-off-by Yonghong Song <[email protected]>--- kernel/bpf/core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)kernel/bpf/core.c +1
-1@@ -371,14 +371,17 @@ static int bpf_adj_delta_to_imm(struct bpf_insn *insn, u32 pos, s32 end_old,static int bpf_adj_delta_to_off (struct bpf_insn *insn,u32 pos,s32 end_old,s32 end_new,s32 curr,const bool probe_pass) { -const s32 off_min =S16_MIN , off_max =S16_MAX ; +s64 off_min =S16_MIN , off_max =S16_MAX ;s32 delta = end_new - end_old;
kernel/bpf/core.c static int bpf_adj_delta_to_imm(struct bpf_insn *insn, u32 pos, s32 end_old, · line 382
Quoted 10 lines
kernel/bpf/core.c +5
-3-s32 off; +s64 off; -if (insn->code == (BPF_JMP32 |BPF_JA )) +if (insn->code == (BPF_JMP32 |BPF_JA )) { off = insn->imm; -else + off_min =S32_MIN ; + off_max =S32_MAX ; + }else {
nit: it would be more symmetrical and easier to follow if you set S16_{MIN,MAX} in this branch, instead of using variable initialization approach
Quoted 8 lines
kernel/bpf/core.c +1
-1off = insn->off; + }if (curr < pos && curr + off +1 >= end_old) off += delta; --2.34.1
Yonghong Song
reviewerQuoted 44 lines · Andrii Nakryiko
Quoted 43 lines · Yonghong Song
Bpf cpu=v4 support is introduced in [1] and Commit
4cd58e9af8b9("bpf: Support new 32bit offset jmp instruction") added support for new 32bit offset jmp instruction. Unfortunately, in functionbpf_adj_delta_to_off(), for new branch insn with 32bit offset, the offset (plus/minor a small delta) compares to 16-bit offset bound [S16_MIN,S16_MAX], which caused the following verification failure:$ ./test_progs-cpuv4 -t verif_scale_pyperf180 ... insn 10 cannot be patched due to 16-bit range ... libbpf: failed to load object 'pyperf180.bpf.o' scale_test:FAIL:expect_success unexpected error: -12 (errno 12) #405 verif_scale_pyperf180:FAILNote that due to recent llvm18 development, the patch [2] (already applied in bpf-next) needs to be applied to bpf tree for testing purpose.
The fix is rather simple. For 32bit offset branch insn, the adjusted offset compares to [
S32_MIN,S32_MAX] and then verification succeeded.[1] https://lore.kernel.org/all/[email protected] [2] https://lore.kernel.org/bpf/[email protected]Fixes 4cd58e9af8b9 ("bpf: Support new 32bit offset jmp instruction")Signed-off-by Yonghong Song <[email protected]>--- kernel/bpf/core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)kernel/bpf/core.c +2
-2@@ -371,14 +371,17 @@ static int bpf_adj_delta_to_imm(struct bpf_insn *insn, u32 pos, s32 end_old,static int bpf_adj_delta_to_off (struct bpf_insn *insn,u32 pos,s32 end_old,s32 end_new,s32 curr,const bool probe_pass) { -const s32 off_min =S16_MIN , off_max =S16_MAX ; +s64 off_min =S16_MIN , off_max =S16_MAX ;s32 delta = end_new - end_old; -s32 off; +s64 off;
Quoted 10 lines
kernel/bpf/core.c static int bpf_adj_delta_to_imm(struct bpf_insn *insn, u32 pos, s32 end_old, · line 382
Quoted 7 lines
kernel/bpf/core.c +4
-2-if (insn->code == (BPF_JMP32 |BPF_JA )) +if (insn->code == (BPF_JMP32 |BPF_JA )) { off = insn->imm; -else + off_min =S32_MIN ; + off_max =S32_MAX ; + }else {nit: it would be more symmetrical and easier to follow if you set S16_{MIN,MAX} in this branch, instead of using variable initialization approach
I tried to minimize the code change but probably not worth it. If no further errors in this patch, should I send v3 with better coding style or Maintainers could help do the change? Either way, please let me know.
Quoted 9 lines
Quoted 9 lines
kernel/bpf/core.c +1
-1off = insn->off; + }if (curr < pos && curr + off +1 >= end_old) off += delta; --2.34.1