public inbox for bpf@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrii Nakryiko <andrii@kernel.org>
To: <bpf@vger.kernel.org>, <ast@kernel.org>, <daniel@iogearbox.net>,
	<martin.lau@kernel.org>
Cc: <andrii@kernel.org>, <kernel-team@meta.com>
Subject: [PATCH bpf-next 3/7] bpf: enforce precision for r0 on callback return
Date: Mon, 30 Oct 2023 22:03:20 -0700	[thread overview]
Message-ID: <20231031050324.1107444-4-andrii@kernel.org> (raw)
In-Reply-To: <20231031050324.1107444-1-andrii@kernel.org>

Given verifier checks actual value, r0 has to be precise, so we need to
propagate precision properly.

Fixes: 69c087ba6225 ("bpf: Add bpf_for_each_map_elem() helper")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
 kernel/bpf/verifier.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index fbb779583d52..098ba0e1a6ff 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -9739,6 +9739,12 @@ static int prepare_func_exit(struct bpf_verifier_env *env, int *insn_idx)
 			verbose(env, "R0 not a scalar value\n");
 			return -EACCES;
 		}
+
+		/* we are going to enforce precise value, mark r0 precise */
+		err = mark_chain_precision(env, BPF_REG_0);
+		if (err)
+			return err;
+
 		if (!tnum_in(range, r0->var_off)) {
 			verbose_invalid_scalar(env, r0, &range, "callback return", "R0");
 			return -EINVAL;
-- 
2.34.1


  parent reply	other threads:[~2023-10-31  5:03 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-31  5:03 [PATCH bpf-next 0/7] Complete BPF verifier precision tracking support for register spills Andrii Nakryiko
2023-10-31  5:03 ` [PATCH bpf-next 1/7] bpf: use common jump (instruction) history across all states Andrii Nakryiko
2023-11-09 15:20   ` Eduard Zingerman
2023-11-09 16:13     ` Alexei Starovoitov
2023-11-09 17:28       ` Andrii Nakryiko
2023-11-09 19:29         ` Alexei Starovoitov
2023-11-09 19:49           ` Andrii Nakryiko
2023-11-09 20:39             ` Andrii Nakryiko
2023-11-09 22:05               ` Alexei Starovoitov
2023-11-09 22:57                 ` Andrii Nakryiko
2023-11-11  4:29                   ` Andrii Nakryiko
2023-10-31  5:03 ` [PATCH bpf-next 2/7] bpf: support non-r10 register spill/fill to/from stack in precision tracking Andrii Nakryiko
2023-11-09 15:20   ` Eduard Zingerman
2023-11-09 17:20     ` Andrii Nakryiko
2023-11-09 18:20       ` Eduard Zingerman
2023-11-10  5:48         ` Andrii Nakryiko
2023-11-12  1:57           ` Andrii Nakryiko
2023-11-12 14:05             ` Eduard Zingerman
2023-10-31  5:03 ` Andrii Nakryiko [this message]
2023-11-09 15:20   ` [PATCH bpf-next 3/7] bpf: enforce precision for r0 on callback return Eduard Zingerman
2023-11-09 17:32     ` Andrii Nakryiko
2023-11-09 17:38       ` Eduard Zingerman
2023-11-09 17:50         ` Andrii Nakryiko
2023-11-09 17:58           ` Alexei Starovoitov
2023-11-09 18:01             ` Andrii Nakryiko
2023-11-09 18:03               ` Eduard Zingerman
2023-11-09 18:00           ` Eduard Zingerman
2023-10-31  5:03 ` [PATCH bpf-next 4/7] bpf: fix check for attempt to corrupt spilled pointer Andrii Nakryiko
2023-11-09 15:20   ` Eduard Zingerman
2023-10-31  5:03 ` [PATCH bpf-next 5/7] bpf: preserve STACK_ZERO slots on partial reg spills Andrii Nakryiko
2023-11-09 15:20   ` Eduard Zingerman
2023-11-09 17:37     ` Andrii Nakryiko
2023-11-09 17:54       ` Eduard Zingerman
2023-10-31  5:03 ` [PATCH bpf-next 6/7] bpf: preserve constant zero when doing partial register restore Andrii Nakryiko
2023-11-09 15:20   ` Eduard Zingerman
2023-11-09 17:41     ` Andrii Nakryiko
2023-11-09 19:34       ` Eduard Zingerman
2023-10-31  5:03 ` [PATCH bpf-next 7/7] bpf: track aligned STACK_ZERO cases as imprecise spilled registers Andrii Nakryiko
2023-10-31  5:22   ` Andrii Nakryiko
2023-11-01  7:56     ` Jiri Olsa
2023-11-01 16:27       ` Andrii Nakryiko
2023-11-02  9:54         ` Jiri Olsa
2023-11-09 15:21   ` Eduard Zingerman
2023-11-09 17:43     ` Andrii Nakryiko
2023-11-09 17:44       ` Eduard Zingerman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231031050324.1107444-4-andrii@kernel.org \
    --to=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=kernel-team@meta.com \
    --cc=martin.lau@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox