crypto: nx - Fixing SHA update bug

Bug happens when a data size less than SHA block size is passed.
Since first attempt will be saved in buffer, second round attempt
get into two step to calculate op.inlen and op.outlen. The issue
resides in this step. A  wrong value of op.inlen and outlen was being
calculated.

This patch fix this eliminate the nx_sha_build_sg_list, that is
useless in SHA's algorithm context. Instead we call nx_build_sg_list
directly and pass a previous calculated max_sg_len to it.

Signed-off-by: Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 0 insertions, 47 deletions

diff --git a/drivers/crypto/nx/nx.c b/drivers/crypto/nx/nx.c
index 4856f7287eae..2e2529ce8d31 100644
--- a/drivers/crypto/nx/nx.c
+++ b/drivers/crypto/nx/nx.c
@@ -252,53 +252,6 @@ static long int trim_sg_list(struct nx_sg *sg,
 }
 
 /**
- * nx_sha_build_sg_list - walk and build sg list to sha modes
- *                        using right bounds and limits.
- * @nx_ctx: NX crypto context for the lists we're building
- * @nx_sg: current sg list in or out list
- * @op_len: current op_len to be used in order to build a sg list
- * @nbytes:  number or bytes to be processed
- * @offset: buf offset
- * @mode: SHA256 or SHA512
- */
-int nx_sha_build_sg_list(struct nx_crypto_ctx *nx_ctx,
-                          struct nx_sg        *nx_in_outsg,
-                          s64                 *op_len,
-                          unsigned int        *nbytes,
-                          u8                  *offset,
-                          u32                 mode)
-{
-        unsigned int delta = 0;
-        unsigned int total = *nbytes;
-        struct nx_sg *nx_insg = nx_in_outsg;
-        unsigned int max_sg_len;
-
-        max_sg_len = min_t(u64, nx_ctx->ap->sglen,
-                        nx_driver.of.max_sg_len/sizeof(struct nx_sg));
-        max_sg_len = min_t(u64, max_sg_len,
-                        nx_ctx->ap->databytelen/NX_PAGE_SIZE);
-
-        *nbytes = min_t(u64, *nbytes, nx_ctx->ap->databytelen);
-        nx_insg = nx_build_sg_list(nx_insg, offset, nbytes, max_sg_len);
-
-        switch (mode) {
-        case NX_DS_SHA256:
-                if (*nbytes < total)
-                        delta = *nbytes - (*nbytes & ~(SHA256_BLOCK_SIZE - 1));
-                break;
-        case NX_DS_SHA512:
-                if (*nbytes < total)
-                        delta = *nbytes - (*nbytes & ~(SHA512_BLOCK_SIZE - 1));
-                break;
-        default:
-                return -EINVAL;
-        }
-        *op_len = trim_sg_list(nx_in_outsg, nx_insg, delta);
-
-        return 0;
-}
-
-/**
  * nx_build_sg_lists - walk the input scatterlists and build arrays of NX
  *                     scatterlists based on them.
  *