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@xxxxxxxxxx>
---
kernel/bpf/btf.c | 2 +-
kernel/bpf/log.c | 4 +++-
kernel/bpf/verifier.c | 6 ++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index a67b1b669b0c..36e3c25bdca5 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -5594,7 +5594,7 @@ static struct btf *btf_parse(bpfptr_t btf_data, u32 btf_data_size,
}
bpf_vlog_finalize(log);
- if (log->level && bpf_vlog_truncated(log)) {
+ if (bpf_vlog_truncated(log)) {
err = -ENOSPC;
goto errout_meta;
}
diff --git a/kernel/bpf/log.c b/kernel/bpf/log.c
index 0bcc0c5ce697..a64cc430a9c9 100644
--- a/kernel/bpf/log.c
+++ b/kernel/bpf/log.c
@@ -167,7 +167,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;
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 82a5876940aa..efeeafe590b9 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -18787,12 +18787,10 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr)
env->prog->aux->verified_insns = env->insn_processed;
bpf_vlog_finalize(log);
- if (log->level && bpf_vlog_truncated(log))
+ if (bpf_vlog_truncated(log))
ret = -ENOSPC;
- if (log->level && log->level != BPF_LOG_KERNEL && !log->ubuf) {
+ if (log->level && log->level != BPF_LOG_KERNEL && !log->ubuf)
ret = -EFAULT;
- goto err_release_maps;
- }
if (ret)
goto err_release_maps;
--
2.34.1
