linux-kernel - Re: linux-next: manual merge of the rust-pin-init tree with Linus' tree

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: <f22491ca-d133-4d61-8ad4-cf7ae3ac9338@kernel.org>
Date: Fri, 12 Sep 2025 09:58:26 +0200
From: Danilo Krummrich <dakr@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Benno Lossin <lossin@...nel.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the rust-pin-init tree with Linus'
 tree

On 9/12/25 5:51 AM, Stephen Rothwell wrote:
> diff --cc rust/kernel/devres.rs
> index 132545962218,91dbf3f4b166..000000000000
> --- a/rust/kernel/devres.rs
> +++ b/rust/kernel/devres.rs
> @@@ -135,21 -134,11 +135,19 @@@ impl<T: Send> Devres<T> 
>           T: 'a,
>           Error: From<E>,
>       {
> -         let callback = Self::devres_callback;
> - 
>           try_pin_init!(&this in Self {
>               dev: dev.into(),
> -             callback,
> +             callback: Self::devres_callback,
>               // INVARIANT: `inner` is properly initialized.
>  -            inner <- {
>  +            inner <- Opaque::pin_init(try_pin_init!(Inner {
>  +                    devm <- Completion::new(),
>  +                    revoke <- Completion::new(),
>  +                    data <- Revocable::new(data),
>  +            })),
>  +            // TODO: Replace with "initializer code blocks" [1] once available.
>  +            //
>  +            // [1] https://github.com/Rust-for-Linux/pin-init/pull/69
>  +            _add_action: {
>                   // SAFETY: `this` is a valid pointer to uninitialized memory.
>                   let inner = unsafe { &raw mut (*this.as_ptr()).inner };
>   
> @@@ -160,14 -149,14 +158,14 @@@
>                   //    properly initialized, because we require `dev` (i.e. the *bound* device) to
>                   //    live at least as long as the returned `impl PinInit<Self, Error>`.
>                   to_result(unsafe {
> -                     bindings::devm_add_action(dev.as_raw(), Some(callback), inner.cast())
> +                     bindings::devm_add_action(dev.as_raw(), Some(*callback), inner.cast())
>  -                })?;
>  +                }).inspect_err(|_| {
>  +                    let inner = Opaque::cast_into(inner);
>   
>  -                Opaque::pin_init(try_pin_init!(Inner {
>  -                    devm <- Completion::new(),
>  -                    revoke <- Completion::new(),
>  -                    data <- Revocable::new(data),
>  -                }))
>  +                    // SAFETY: `inner` is a valid pointer to an `Inner<T>` and valid for both reads
>  +                    // and writes.
>  +                    unsafe { core::ptr::drop_in_place(inner) };
>  +                })?;
>               },
>           })
>       }

Looks good, thanks!