]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
bpf: handle jset (if a & b ...) as a jump in CFG computation
authorEduard Zingerman <eddyz87@gmail.com>
Fri, 13 Jun 2025 17:53:30 +0000 (10:53 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 13 Jun 2025 18:51:19 +0000 (11:51 -0700)
BPF_JSET is a conditional jump and currently verifier.c:can_jump()
does not know about that. This can lead to incorrect live registers
and SCC computation.

E.g. in the following example:

   1: r0 = 1;
   2: r2 = 2;
   3: if r1 & 0x7 goto +1;
   4: exit;
   5: r0 = r2;
   6: exit;

W/o this fix insn_successors(3) will return only (4), a jump to (5)
would be missed and r2 won't be marked as alive at (3).

Fixes: 14c8552db644 ("bpf: simple DFA-based live registers analysis")
Reported-by: syzbot+a36aac327960ff474804@syzkaller.appspotmail.com
Suggested-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20250613175331.3238739-1-eddyz87@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/verifier.c

index fd81cff116170dd65e116457dffac18afcf9450f..a1c312e216ca980bbd838977341a78fcfa4f37a7 100644 (file)
@@ -23951,6 +23951,7 @@ static bool can_jump(struct bpf_insn *insn)
        case BPF_JSLT:
        case BPF_JSLE:
        case BPF_JCOND:
+       case BPF_JSET:
                return true;
        }