From: Mykyta Yatsenko read_str_var() returns 0 instead of the current payload offset when a string can't be read, so the next string overwrites the payload that earlier str_lens[] still describe. Return the unchanged offset. Signed-off-by: Mykyta Yatsenko --- tools/testing/selftests/bpf/progs/strobemeta.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/strobemeta.h b/tools/testing/selftests/bpf/progs/strobemeta.h index 584a68248764..626a0abacc69 100644 --- a/tools/testing/selftests/bpf/progs/strobemeta.h +++ b/tools/testing/selftests/bpf/progs/strobemeta.h @@ -367,7 +367,7 @@ static __always_inline uint64_t read_str_var(struct strobemeta_cfg *cfg, data->str_lens[idx] = 0; location = calc_location(&cfg->str_locs[idx], tls_base); if (bpf_probe_read_user(value, sizeof(struct strobe_value_generic), location)) - return 0; + return off; len = bpf_probe_read_user_str(&data->payload[off], STROBE_MAX_STR_LEN, value->ptr); /* @@ -378,7 +378,7 @@ static __always_inline uint64_t read_str_var(struct strobemeta_cfg *cfg, * STROBE_MAX_STR_LEN */ if (len > STROBE_MAX_STR_LEN) - return 0; + return off; data->str_lens[idx] = len; return off + len; -- 2.53.0-Meta