crypto: qce - use cryptlen when adding extra sgl

The qce crypto driver appends an extra entry to the dst sgl, to maintain
private state information.

When the gcm driver sends requests to the ctr skcipher, it passes the
authentication tag after the actual crypto payload, but it must not be
touched.

Commit 1336c2221bee ("crypto: qce - save a sg table slot for result
buf") limited the destination sgl to avoid overwriting the
authentication tag but it assumed the tag would be in a separate sgl
entry.

This is not always the case, so it is better to limit the length of the
destination buffer to req->cryptlen before appending the result buf.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qce/dma.c b/drivers/crypto/qce/dma.c
index 7da893dc00e73c94b08ef09397c2d6ed64d14b40..46db5bf366b44bfea7180947ee0cbf998478da78 100644 (file)
--- a/drivers/crypto/qce/dma.c
+++ b/drivers/crypto/qce/dma.c
@@ -48,9 +48,10 @@ void qce_dma_release(struct qce_dma_data *dma)
 
 struct scatterlist *
 qce_sgtable_add(struct sg_table *sgt, struct scatterlist *new_sgl,
-               int max_ents)
+               unsigned int max_len)
 {
        struct scatterlist *sg = sgt->sgl, *sg_last = NULL;
+       unsigned int new_len;
 
        while (sg) {
                if (!sg_page(sg))
@@ -61,13 +62,13 @@ qce_sgtable_add(struct sg_table *sgt, struct scatterlist *new_sgl,
        if (!sg)
                return ERR_PTR(-EINVAL);
 
-       while (new_sgl && sg && max_ents) {
-               sg_set_page(sg, sg_page(new_sgl), new_sgl->length,
-                           new_sgl->offset);
+       while (new_sgl && sg && max_len) {
+               new_len = new_sgl->length > max_len ? max_len : new_sgl->length;
+               sg_set_page(sg, sg_page(new_sgl), new_len, new_sgl->offset);
                sg_last = sg;
                sg = sg_next(sg);
                new_sgl = sg_next(new_sgl);
-               max_ents--;
+               max_len -= new_len;
        }
 
        return sg_last;

diff --git a/drivers/crypto/qce/dma.h b/drivers/crypto/qce/dma.h
index ed25a0d9829e52f6b539a90cb0a72803ce15477a..7864021693608b264a4cee92f465b353f15fbf7d 100644 (file)
--- a/drivers/crypto/qce/dma.h
+++ b/drivers/crypto/qce/dma.h
@@ -43,6 +43,6 @@ void qce_dma_issue_pending(struct qce_dma_data *dma);
 int qce_dma_terminate_all(struct qce_dma_data *dma);
 struct scatterlist *
 qce_sgtable_add(struct sg_table *sgt, struct scatterlist *sg_add,
-               int max_ents);
+               unsigned int max_len);
 
 #endif /* _DMA_H_ */

diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c
index 4217b745f1242206edb6ad37b318ab933ddf54e8..63ae75809cb705558b284a905cdddacf16c75613 100644 (file)
--- a/drivers/crypto/qce/skcipher.c
+++ b/drivers/crypto/qce/skcipher.c
@@ -97,13 +97,14 @@ qce_skcipher_async_req_handle(struct crypto_async_request *async_req)
 
        sg_init_one(&rctx->result_sg, qce->dma.result_buf, QCE_RESULT_BUF_SZ);
 
-       sg = qce_sgtable_add(&rctx->dst_tbl, req->dst, rctx->dst_nents - 1);
+       sg = qce_sgtable_add(&rctx->dst_tbl, req->dst, req->cryptlen);
        if (IS_ERR(sg)) {
                ret = PTR_ERR(sg);
                goto error_free;
        }
 
-       sg = qce_sgtable_add(&rctx->dst_tbl, &rctx->result_sg, 1);
+       sg = qce_sgtable_add(&rctx->dst_tbl, &rctx->result_sg,
+                            QCE_RESULT_BUF_SZ);
        if (IS_ERR(sg)) {
                ret = PTR_ERR(sg);
                goto error_free;