diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-21 08:53:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-21 08:53:43 +0200 |
| commit | c6d9e43954bfa7415a1e9efdb2806ec1d8a8afc8 (patch) | |
| tree | 4f8b23679ea48fcfbee582f876f62e144c71f8d7 /kernel/bpf/log.c | |
| parent | 07b887f8236eb3ed52f1fe83e385e6436dc4b052 (diff) | |
| parent | 42f7652d3eb527d03665b09edac47f85fb600924 (diff) | |
Merge 6.12-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/bpf/log.c')
| -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; } |