Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
MIME-Version: 1.0
References: <20231029050300.154832-1-ebiggers@kernel.org>
In-Reply-To: <20231029050300.154832-1-ebiggers@kernel.org>
From:   Steve French <smfrench@gmail.com>
Date:   Sun, 29 Oct 2023 20:10:51 -0500
Message-ID: <CAH2r5mvsVVfKc=p5PKjRhhmnSodVbXeZqir5h4puL-jJcHoQ_w@mail.gmail.com>
Subject: Re: [PATCH] smb: use crypto_shash_digest() in symlink_hash()
To:     Eric Biggers <ebiggers@kernel.org>
Cc:     Steve French <sfrench@samba.org>, linux-cifs@vger.kernel.org,
        linux-crypto@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

tentatively merged into cifs-2.6.git for-next pending additional testing

On Sun, Oct 29, 2023 at 12:03=E2=80=AFAM Eric Biggers <ebiggers@kernel.org>=
 wrote:
>
> From: Eric Biggers <ebiggers@google.com>
>
> Simplify symlink_hash() by using crypto_shash_digest() instead of an
> init+update+final sequence.  This should also improve performance.
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  fs/smb/client/link.c | 16 ++--------------
>  1 file changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/fs/smb/client/link.c b/fs/smb/client/link.c
> index c66be4904e1f..a1da50e66fbb 100644
> --- a/fs/smb/client/link.c
> +++ b/fs/smb/client/link.c
> @@ -35,37 +35,25 @@
>  #define CIFS_MF_SYMLINK_MD5_ARGS(md5_hash) md5_hash
>
>  static int
>  symlink_hash(unsigned int link_len, const char *link_str, u8 *md5_hash)
>  {
>         int rc;
>         struct shash_desc *md5 =3D NULL;
>
>         rc =3D cifs_alloc_hash("md5", &md5);
>         if (rc)
> -               goto symlink_hash_err;
> +               return rc;
>
> -       rc =3D crypto_shash_init(md5);
> -       if (rc) {
> -               cifs_dbg(VFS, "%s: Could not init md5 shash\n", __func__)=
;
> -               goto symlink_hash_err;
> -       }
> -       rc =3D crypto_shash_update(md5, link_str, link_len);
> -       if (rc) {
> -               cifs_dbg(VFS, "%s: Could not update with link_str\n", __f=
unc__);
> -               goto symlink_hash_err;
> -       }
> -       rc =3D crypto_shash_final(md5, md5_hash);
> +       rc =3D crypto_shash_digest(md5, link_str, link_len, md5_hash);
>         if (rc)
>                 cifs_dbg(VFS, "%s: Could not generate md5 hash\n", __func=
__);
> -
> -symlink_hash_err:
>         cifs_free_hash(&md5);
>         return rc;
>  }
>
>  static int
>  parse_mf_symlink(const u8 *buf, unsigned int buf_len, unsigned int *_lin=
k_len,
>                  char **_link_str)
>  {
>         int rc;
>         unsigned int link_len;
>
> base-commit: 2af9b20dbb39f6ebf9b9b6c090271594627d818e
> --
> 2.42.0
>


--=20
Thanks,

Steve