linux-kernel - Re: [PATCH 1/1] rust: macros: fix redefine const

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <-tQGhW-nja4JfdjHgbQgLqvDMc8gxJRsUFsk-cA9n7Q7w5g93rowJacyTT9G1T1_92g1DW1Y7OxjyndTEOYr32vp25DL--rX3W_56M1I8hY=@proton.me>
Date:   Wed, 28 Jun 2023 09:59:22 +0000
From:   Benno Lossin <benno.lossin@...ton.me>
To:     Qingsong Chen <changxian.cqs@...group.com>
Cc:     linux-kernel@...r.kernel.org,
        田洪亮 <tate.thl@...group.com>,
        Miguel Ojeda <ojeda@...nel.org>,
        Alex Gaynor <alex.gaynor@...il.com>,
        Wedson Almeida Filho <wedsonaf@...il.com>,
        Boqun Feng <boqun.feng@...il.com>, Gary Guo <gary@...yguo.net>,
        Björn Roy Baron <bjorn3_gh@...tonmail.com>,
        Sergio González Collado <sergio.collado@...il.com>,
        rust-for-linux@...r.kernel.org
Subject: Re: [PATCH 1/1] rust: macros: fix redefine const_name in `vtable`

On 26.06.23 09:42, Qingsong Chen wrote:
> If the trait has same function name, the `vtable` macro
> will redefine its `gen_const_name`, e.g.:
> ```rust
>      #[vtable]
>      pub trait Foo {
>          #[cfg(CONFIG_X)]
>          fn bar();
> 
>          #[cfg(not(CONFIG_X))]
>          fn bar(x: usize);
>      }
> ```
> Use `HashSet` to avoid this.
> 
> Signed-off-by: Qingsong Chen <changxian.cqs@...group.com>

Reviewed-by: Benno Lossin <benno.lossin@...ton.me>

> ---
>   rust/macros/vtable.rs | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rust/macros/vtable.rs b/rust/macros/vtable.rs
> index 34d5e7fb5768..08eb0355f99b 100644
> --- a/rust/macros/vtable.rs
> +++ b/rust/macros/vtable.rs
> @@ -27,7 +27,7 @@ pub(crate) fn vtable(_attr: TokenStream, ts: TokenStream) -> TokenStream {
>       };
> 
>       let mut body_it = body.stream().into_iter();
> -    let mut functions = Vec::new();
> +    let mut functions = HashSet::new();
>       let mut consts = HashSet::new();
>       while let Some(token) = body_it.next() {
>           match token {
> @@ -37,7 +37,7 @@ pub(crate) fn vtable(_attr: TokenStream, ts: TokenStream) -> TokenStream {
>                       // Possibly we've encountered a fn pointer type instead.
>                       _ => continue,
>                   };
> -                functions.push(fn_name);
> +                functions.insert(fn_name);
>               }
>               TokenTree::Ident(ident) if ident.to_string() == "const" => {
>                   let const_name = match body_it.next() {
> --
> 2.40.1
>