bpf: Do cleanup in bpf_bprintf_cleanup only when needed
authorJiri Olsa <jolsa@kernel.org>
Thu, 15 Dec 2022 21:44:29 +0000 (22:44 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Mon, 19 Dec 2022 21:08:06 +0000 (22:08 +0100)
commitf19a4050455aad847fb93f18dc1fe502eb60f989
tree377364cd9f55e19f13e6abb7ef29fada6c3b9f53
parent78aa1cc9404399a15d2a1205329c6a06236f5378
bpf: Do cleanup in bpf_bprintf_cleanup only when needed

Currently we always cleanup/decrement bpf_bprintf_nest_level variable
in bpf_bprintf_cleanup if it's > 0.

There's possible scenario where this could cause a problem, when
bpf_bprintf_prepare does not get bin_args buffer (because num_args is 0)
and following bpf_bprintf_cleanup call decrements bpf_bprintf_nest_level
variable, like:

  in task context:
    bpf_bprintf_prepare(num_args != 0) increments 'bpf_bprintf_nest_level = 1'
    -> first irq :
       bpf_bprintf_prepare(num_args == 0)
       bpf_bprintf_cleanup decrements 'bpf_bprintf_nest_level = 0'
    -> second irq:
       bpf_bprintf_prepare(num_args != 0) bpf_bprintf_nest_level = 1
       gets same buffer as task context above

Adding check to bpf_bprintf_cleanup and doing the real cleanup only if we
got bin_args data in the first place.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20221215214430.1336195-3-jolsa@kernel.org
include/linux/bpf.h
kernel/bpf/helpers.c
kernel/trace/bpf_trace.c