2023-10-29 05:03:54

by Eric Biggers

Subject: [PATCH] smb: use crypto_shash_digest() in symlink_hash()

From: Eric Biggers <[email protected]>

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 <[email protected]>
---
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 = NULL;

rc = cifs_alloc_hash("md5", &md5);
if (rc)
- goto symlink_hash_err;
+ return rc;

- rc = crypto_shash_init(md5);
- if (rc) {
- cifs_dbg(VFS, "%s: Could not init md5 shash\n", __func__);
- goto symlink_hash_err;
- }
- rc = crypto_shash_update(md5, link_str, link_len);
- if (rc) {
- cifs_dbg(VFS, "%s: Could not update with link_str\n", __func__);
- goto symlink_hash_err;
- }
- rc = crypto_shash_final(md5, md5_hash);
+ rc = 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 *_link_len,
char **_link_str)
{
int rc;
unsigned int link_len;

base-commit: 2af9b20dbb39f6ebf9b9b6c090271594627d818e
--
2.42.0

2023-10-30 01:14:04

by Steve French

Subject: Re: [PATCH] smb: use crypto_shash_digest() in symlink_hash()

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

On Sun, Oct 29, 2023 at 12:03 AM Eric Biggers <[email protected]> wrote:
>
> From: Eric Biggers <[email protected]>
>
> 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 <[email protected]>
> ---
> 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 = NULL;
>
> rc = cifs_alloc_hash("md5", &md5);
> if (rc)
> - goto symlink_hash_err;
> + return rc;
>
> - rc = crypto_shash_init(md5);
> - if (rc) {
> - cifs_dbg(VFS, "%s: Could not init md5 shash\n", __func__);
> - goto symlink_hash_err;
> - }
> - rc = crypto_shash_update(md5, link_str, link_len);
> - if (rc) {
> - cifs_dbg(VFS, "%s: Could not update with link_str\n", __func__);
> - goto symlink_hash_err;
> - }
> - rc = crypto_shash_final(md5, md5_hash);
> + rc = 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 *_link_len,
> char **_link_str)
> {
> int rc;
> unsigned int link_len;
>
> base-commit: 2af9b20dbb39f6ebf9b9b6c090271594627d818e
> --
> 2.42.0
>


--
Thanks,

Steve

2023-10-31 15:07:43

by Paulo Alcantara

Subject: Re: [PATCH] smb: use crypto_shash_digest() in symlink_hash()

Eric Biggers <[email protected]> writes:

> From: Eric Biggers <[email protected]>
>
> 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 <[email protected]>
> ---
> 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

Reviewed-by: Paulo Alcantara (SUSE) <[email protected]>