linux-kernel - Re: [PATCH] rust: page: Simplify overflow check using checked

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <DF5ER5QH96IJ.3TVQDT1YQ39VA@nvidia.com>
Date: Tue, 23 Dec 2025 16:12:30 +0900
From: "Alexandre Courbot" <acourbot@...dia.com>
To: "Kari Argillander" <kari.argillander@...il.com>, "Alice Ryhl"
 <aliceryhl@...gle.com>, "Lorenzo Stoakes" <lorenzo.stoakes@...cle.com>,
 "Liam R. Howlett" <Liam.Howlett@...cle.com>, "Miguel Ojeda"
 <ojeda@...nel.org>, "Boqun Feng" <boqun.feng@...il.com>, "Gary Guo"
 <gary@...yguo.net>, Björn Roy Baron
 <bjorn3_gh@...tonmail.com>, "Benno Lossin" <lossin@...nel.org>, "Andreas
 Hindborg" <a.hindborg@...nel.org>, "Trevor Gross" <tmgross@...ch.edu>,
 "Danilo Krummrich" <dakr@...nel.org>
Cc: <linux-mm@...ck.org>, <rust-for-linux@...r.kernel.org>,
 <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] rust: page: Simplify overflow check using checked_add()

On Sat Dec 20, 2025 at 6:29 AM JST, Kari Argillander wrote:
> Replace the explicit bounds comparisons with a single checked_add()-based
> range check. This avoids redundant comparisons, makes the overflow case
> explicit, and results in simpler generated code (checked with godbolt
> for x86).
>
> Option::is_none_or() would be nicer, but it requires Rust 1.82; the
> kernel currently targets 1.78.
>
> No functional change intended.
>
> Signed-off-by: Kari Argillander <kari.argillander@...il.com>
> ---
>  rust/kernel/page.rs | 18 ++++++++----------
>  1 file changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/rust/kernel/page.rs b/rust/kernel/page.rs
> index 432fc0297d4a..a07e6d256860 100644
> --- a/rust/kernel/page.rs
> +++ b/rust/kernel/page.rs
> @@ -239,17 +239,15 @@ fn with_pointer_into_page<T>(
>          len: usize,
>          f: impl FnOnce(*mut u8) -> Result<T>,
>      ) -> Result<T> {
> -        let bounds_ok = off <= PAGE_SIZE && len <= PAGE_SIZE && (off + len) <= PAGE_SIZE;
> -
> -        if bounds_ok {
> -            self.with_page_mapped(move |page_addr| {
> -                // SAFETY: The `off` integer is at most `PAGE_SIZE`, so this pointer offset will
> -                // result in a pointer that is in bounds or one off the end of the page.
> -                f(unsafe { page_addr.add(off) })
> -            })
> -        } else {
> -            Err(EINVAL)
> +        if off.checked_add(len).map_or(true, |end| end > PAGE_SIZE) {

I find this line a bit heavy with the two-steps check, how about
something like:

    if !matches!(off.checked_add(len), Some(e) if e <= PAGE_SIZE) {

Just for your consideration - the original is still valid and an
improvement over the original code, so regardless:

Reviewed-by: Alexandre Courbot <acourbot@...dia.com>