diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2024-10-16 15:49:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-11-01 02:02:32 +0100 |
| commit | 9509ade927c67075bf438714be2fc46884b62904 (patch) | |
| tree | 1e109c0155836cf28f3e9faf8ab1c6131f49b5cc /kernel | |
| parent | 6bac3c169a86cb6a7c492aaea3b571eb44590017 (diff) | |
| download | linux-9509ade927c67075bf438714be2fc46884b62904.tar.gz linux-9509ade927c67075bf438714be2fc46884b62904.tar.bz2 linux-9509ade927c67075bf438714be2fc46884b62904.zip | |
bpf: Fix print_reg_state's constant scalar dump
[ Upstream commit 3e9e708757ca3b7eb65a820031d62fea1a265709 ]
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: 98d7ca374ba4 ("bpf: Track delta between "linked" registers.")
Reported-by: Nathaniel Theis <nathaniel.theis@nccgroup.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20241016134913.32249-2-daniel@iogearbox.net
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/log.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/bpf/log.c b/kernel/bpf/log.c index 5aebfc3051e3..4a858fdb6476 100644 --- a/kernel/bpf/log.c +++ b/kernel/bpf/log.c @@ -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; } |