From: Daniel Borkmann <daniel@iogearbox.net>
To: Youlin Li <liulin063@gmail.com>, haoluo@google.com
Cc: ast@kernel.org, john.fastabend@gmail.com, andrii@kernel.org,
martin.lau@linux.dev, song@kernel.org, yhs@fb.com,
kpsingh@kernel.org, sdf@google.com, jolsa@kernel.org,
bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] bpf: Fix 32bit bounds update in ALU64
Date: Wed, 17 Aug 2022 22:31:30 +0200 [thread overview]
Message-ID: <5d2addca-10e5-f7a6-9efd-43322eec8347@iogearbox.net> (raw)
In-Reply-To: <20220810100849.25710-1-liulin063@gmail.com>
On 8/10/22 12:08 PM, Youlin Li wrote:
> The commit ("bpf: Do more tight ALU bounds tracking") introduces a bug
> that fails some selftests.
>
> in previous versions of the code, when
> __reg_combine_64_into_32() was called, the 32bit boundary was
> completely deduced from the 64bit boundary, so there was a call to
> __mark_reg32_unbounded() in __reg_combine_64_into_32(). But before
> adjust_scalar_min_max_vals() calls
> __reg_combine_64_into_32() , the 32bit bounds are already calculated
> to some extent, and __mark_reg32_unbounded() will eliminate these
> information.
>
> Simply remove the call to __reg_combine_64_into_32() and copying a code
> without __mark_reg32_unbounded() should work.
>
> Before:
> ./test_verifier 142
> #142/p bounds check after truncation of non-boundary-crossing range FAIL
> Failed to load prog 'Permission denied'!
> invalid access to map value, value_size=8 off=16777215 size=1
> R0 max value is outside of the allowed memory range
> verification time 149 usec
> stack depth 8
> processed 15 insns (limit 1000000) max_states_per_insn 0
> total_states 0 peak_states 0 mark_read 0
> Summary: 0 PASSED, 1 SKIPPED, 1 FAILED
>
> After:
> ./test_verifier 142
> #142/p bounds check after truncation of non-boundary-crossing range OK
> Summary: 1 PASSED, 1 SKIPPED, 0 FAILED
>
> Signed-off-by: Youlin Li <liulin063@gmail.com>
> ---
> kernel/bpf/verifier.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index 11d8bb54ba6b..7ea6e0372d62 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -9014,7 +9014,17 @@ static int adjust_scalar_min_max_vals(struct bpf_verifier_env *env,
> /* ALU32 ops are zero extended into 64bit register */
> zext_32_to_64(dst_reg);
> } else {
> - __reg_combine_64_into_32(dst_reg);
> + if (__reg64_bound_s32(dst_reg->smin_value) &&
> + __reg64_bound_s32(dst_reg->smax_value)) {
> + dst_reg->s32_min_value = (s32)dst_reg->smin_value;
> + dst_reg->s32_max_value = (s32)dst_reg->smax_value;
> + }
> + if (__reg64_bound_u32(dst_reg->umin_value) &&
> + __reg64_bound_u32(dst_reg->umax_value)) {
> + dst_reg->u32_min_value = (u32)dst_reg->umin_value;
> + dst_reg->u32_max_value = (u32)dst_reg->umax_value;
> + }
> + reg_bounds_sync(dst_reg);
Hm, this doesn't apply to the bpf tree. Is this on top of your previous patch [0]?
Please squash both together in that case and resubmit your previous one as a v2.
[0] https://lore.kernel.org/bpf/9f954e67-67fc-e3b9-d810-22bfea95d2aa@iogearbox.net/
Thanks,
Daniel
next prev parent reply other threads:[~2022-08-17 20:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 3:30 [PATCH bpf] bpf: Do more tight ALU bounds tracking Kuee K1r0a
2022-07-29 3:51 ` Hao Luo
2022-07-29 4:43 ` Youlin Li
2022-07-29 17:11 ` Hao Luo
2022-07-29 22:42 ` Youlin Li
2022-07-29 22:48 ` Hao Luo
2022-08-08 13:25 ` Daniel Borkmann
[not found] ` <CANdZH3U7axKg6zDY+iswF2d1fBYY1Xo2jeVsbgMYMoJfd1AYJg@mail.gmail.com>
2022-08-08 15:14 ` Fwd: " Kuee k1r0a
2022-08-08 15:42 ` Daniel Borkmann
2022-08-10 10:08 ` [PATCH 1/2] bpf: Fix 32bit bounds update in ALU64 Youlin Li
2022-08-17 20:31 ` Daniel Borkmann [this message]
2022-08-27 13:57 ` [PATCH bpf v2 1/2] bpf: Do more tight ALU bounds tracking Youlin Li
2022-08-30 0:19 ` Hao Luo
2022-08-10 10:09 ` [PATCH 2/2] bpf, selftests: Add verifier test case for ALU64 Youlin Li
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=5d2addca-10e5-f7a6-9efd-43322eec8347@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liulin063@gmail.com \
--cc=martin.lau@linux.dev \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=yhs@fb.com \
/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;
as well as URLs for NNTP newsgroup(s).