Commit 3e9e7087 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Andrii Nakryiko
Browse files

bpf: Fix print_reg_state's constant scalar dump 



print_reg_state() should not consider adding reg->off to reg->var_off.value
when dumping scalars. Scalars can be produced with reg->off != 0 through
BPF_ADD_CONST, and thus as-is this can skew the register log dump.

Fixes: 98d7ca37 ("bpf: Track delta between "linked" registers.")
Reported-by: default avatarNathaniel Theis <nathaniel.theis@nccgroup.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20241016134913.32249-2-daniel@iogearbox.net
parent 3878ae04

kernel/bpf/log.c

+1 −2
Original line number Diff line number Diff line
@@ -688,8 +688,7 @@ static void print_reg_state(struct bpf_verifier_env *env, 
	if (t == SCALAR_VALUE && reg->precise)

		verbose(env, "P");

	if (t == SCALAR_VALUE && tnum_is_const(reg->var_off)) {

		/* reg->off should be 0 for SCALAR_VALUE */

		verbose_snum(env, reg->var_off.value + reg->off);

		verbose_snum(env, reg->var_off.value);

		return;

	}