| Message ID | 20200502053122.995648-16-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: introduce crypto_shash_tfm_digest() | expand |
On Fri, May 01, 2020 at 10:31:17PM -0700, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > Instead of manually allocating a 'struct shash_desc' on the stack and > calling crypto_shash_digest(), switch to using the new helper function > crypto_shash_tfm_digest() which does this for us. > > Cc: linux-nfs@vger.kernel.org > Signed-off-by: Eric Biggers <ebiggers@google.com> Acked-by: J. Bruce Fields <bfields@redhat.com> if you need it. --b. > --- > fs/nfsd/nfs4recover.c | 26 ++++++-------------------- > 1 file changed, 6 insertions(+), 20 deletions(-) > > diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c > index a8fb18609146a2..9e40dfecf1b1a6 100644 > --- a/fs/nfsd/nfs4recover.c > +++ b/fs/nfsd/nfs4recover.c > @@ -127,16 +127,8 @@ nfs4_make_rec_clidname(char *dname, const struct xdr_netobj *clname) > goto out; > } > > - { > - SHASH_DESC_ON_STACK(desc, tfm); > - > - desc->tfm = tfm; > - > - status = crypto_shash_digest(desc, clname->data, clname->len, > - cksum.data); > - shash_desc_zero(desc); > - } > - > + status = crypto_shash_tfm_digest(tfm, clname->data, clname->len, > + cksum.data); > if (status) > goto out; > > @@ -1148,7 +1140,6 @@ nfsd4_cld_create_v2(struct nfs4_client *clp) > struct crypto_shash *tfm = cn->cn_tfm; > struct xdr_netobj cksum; > char *principal = NULL; > - SHASH_DESC_ON_STACK(desc, tfm); > > /* Don't upcall if it's already stored */ > if (test_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags)) > @@ -1170,16 +1161,14 @@ nfsd4_cld_create_v2(struct nfs4_client *clp) > else if (clp->cl_cred.cr_principal) > principal = clp->cl_cred.cr_principal; > if (principal) { > - desc->tfm = tfm; > cksum.len = crypto_shash_digestsize(tfm); > cksum.data = kmalloc(cksum.len, GFP_KERNEL); > if (cksum.data == NULL) { > ret = -ENOMEM; > goto out; > } > - ret = crypto_shash_digest(desc, principal, strlen(principal), > - cksum.data); > - shash_desc_zero(desc); > + ret = crypto_shash_tfm_digest(tfm, principal, strlen(principal), > + cksum.data); > if (ret) { > kfree(cksum.data); > goto out; > @@ -1343,7 +1332,6 @@ nfsd4_cld_check_v2(struct nfs4_client *clp) > struct crypto_shash *tfm = cn->cn_tfm; > struct xdr_netobj cksum; > char *principal = NULL; > - SHASH_DESC_ON_STACK(desc, tfm); > > /* did we already find that this client is stable? */ > if (test_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags)) > @@ -1381,14 +1369,12 @@ nfsd4_cld_check_v2(struct nfs4_client *clp) > principal = clp->cl_cred.cr_principal; > if (principal == NULL) > return -ENOENT; > - desc->tfm = tfm; > cksum.len = crypto_shash_digestsize(tfm); > cksum.data = kmalloc(cksum.len, GFP_KERNEL); > if (cksum.data == NULL) > return -ENOENT; > - status = crypto_shash_digest(desc, principal, strlen(principal), > - cksum.data); > - shash_desc_zero(desc); > + status = crypto_shash_tfm_digest(tfm, principal, > + strlen(principal), cksum.data); > if (status) { > kfree(cksum.data); > return -ENOENT; > -- > 2.26.2
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index a8fb18609146a2..9e40dfecf1b1a6 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@ -127,16 +127,8 @@ nfs4_make_rec_clidname(char *dname, const struct xdr_netobj *clname) goto out; } - { - SHASH_DESC_ON_STACK(desc, tfm); - - desc->tfm = tfm; - - status = crypto_shash_digest(desc, clname->data, clname->len, - cksum.data); - shash_desc_zero(desc); - } - + status = crypto_shash_tfm_digest(tfm, clname->data, clname->len, + cksum.data); if (status) goto out; @@ -1148,7 +1140,6 @@ nfsd4_cld_create_v2(struct nfs4_client *clp) struct crypto_shash *tfm = cn->cn_tfm; struct xdr_netobj cksum; char *principal = NULL; - SHASH_DESC_ON_STACK(desc, tfm); /* Don't upcall if it's already stored */ if (test_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags)) @@ -1170,16 +1161,14 @@ nfsd4_cld_create_v2(struct nfs4_client *clp) else if (clp->cl_cred.cr_principal) principal = clp->cl_cred.cr_principal; if (principal) { - desc->tfm = tfm; cksum.len = crypto_shash_digestsize(tfm); cksum.data = kmalloc(cksum.len, GFP_KERNEL); if (cksum.data == NULL) { ret = -ENOMEM; goto out; } - ret = crypto_shash_digest(desc, principal, strlen(principal), - cksum.data); - shash_desc_zero(desc); + ret = crypto_shash_tfm_digest(tfm, principal, strlen(principal), + cksum.data); if (ret) { kfree(cksum.data); goto out; @@ -1343,7 +1332,6 @@ nfsd4_cld_check_v2(struct nfs4_client *clp) struct crypto_shash *tfm = cn->cn_tfm; struct xdr_netobj cksum; char *principal = NULL; - SHASH_DESC_ON_STACK(desc, tfm); /* did we already find that this client is stable? */ if (test_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags)) @@ -1381,14 +1369,12 @@ nfsd4_cld_check_v2(struct nfs4_client *clp) principal = clp->cl_cred.cr_principal; if (principal == NULL) return -ENOENT; - desc->tfm = tfm; cksum.len = crypto_shash_digestsize(tfm); cksum.data = kmalloc(cksum.len, GFP_KERNEL); if (cksum.data == NULL) return -ENOENT; - status = crypto_shash_digest(desc, principal, strlen(principal), - cksum.data); - shash_desc_zero(desc); + status = crypto_shash_tfm_digest(tfm, principal, + strlen(principal), cksum.data); if (status) { kfree(cksum.data); return -ENOENT;