diff options
| author | Andrii Nakryiko <andrii@kernel.org> | 2023-04-07 01:41:56 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2023-04-11 18:05:43 +0200 |
| commit | 8a6ca6bc553e3c878fa53c506bc6ec281efdc039 (patch) | |
| tree | 909f38061d67bc33561cb8d80f850df7db2b2804 /kernel/bpf/log.c | |
| parent | bpf: Avoid incorrect -EFAULT error in BPF_LOG_KERNEL mode (diff) | |
| download | linux-8a6ca6bc553e3c878fa53c506bc6ec281efdc039.tar.xz linux-8a6ca6bc553e3c878fa53c506bc6ec281efdc039.zip | |
bpf: Simplify logging-related error conditions handling
Move log->level == 0 check into bpf_vlog_truncated() instead of doing it
explicitly. Also remove unnecessary goto in kernel/bpf/verifier.c.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Lorenz Bauer <lmb@isovalent.com>
Link: https://lore.kernel.org/bpf/20230406234205.323208-11-andrii@kernel.org
Diffstat (limited to 'kernel/bpf/log.c')
| -rw-r--r-- | kernel/bpf/log.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/bpf/log.c b/kernel/bpf/log.c index d99a50f07187..c778f3b290cb 100644 --- a/kernel/bpf/log.c +++ b/kernel/bpf/log.c @@ -169,7 +169,9 @@ static int bpf_vlog_reverse_ubuf(struct bpf_verifier_log *log, int start, int en bool bpf_vlog_truncated(const struct bpf_verifier_log *log) { - if (log->level & BPF_LOG_FIXED) + if (!log->level) + return false; + else if (log->level & BPF_LOG_FIXED) return bpf_log_used(log) >= log->len_total - 1; else return log->start_pos > 0; |