summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/caam
diff options
context:
space:
mode:
authorPankaj Gupta2019-02-01 08:18:20 +0100
committerGreg Kroah-Hartman2019-03-23 20:09:40 +0100
commit74fd74e1fc8dc6cbbafcf274755d71dae640c823 (patch)
tree9069e1e3373793cbe7ddb6ba90221320e8c01089 /drivers/crypto/caam
parentcrypto: ccree - fix missing break in switch statement (diff)
downloadkernel-qcow2-linux-74fd74e1fc8dc6cbbafcf274755d71dae640c823.tar.gz
kernel-qcow2-linux-74fd74e1fc8dc6cbbafcf274755d71dae640c823.tar.xz
kernel-qcow2-linux-74fd74e1fc8dc6cbbafcf274755d71dae640c823.zip
crypto: caam - fixed handling of sg list
commit 42e95d1f10dcf8b18b1d7f52f7068985b3dc5b79 upstream. when the source sg contains more than 1 fragment and destination sg contains 1 fragment, the caam driver mishandle the buffers to be sent to caam. Fixes: f2147b88b2b1 ("crypto: caam - Convert GCM to new AEAD interface") Cc: <stable@vger.kernel.org> # 4.2+ Signed-off-by: Pankaj Gupta <pankaj.gupta@nxp.com> Signed-off-by: Arun Pathak <arun.pathak@nxp.com> Reviewed-by: Horia Geanta <horia.geanta@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/crypto/caam')
-rw-r--r--drivers/crypto/caam/caamalg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index ec40f991e6c6..9bc54c3c2cb9 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -1005,6 +1005,7 @@ static void init_aead_job(struct aead_request *req,
if (unlikely(req->src != req->dst)) {
if (edesc->dst_nents == 1) {
dst_dma = sg_dma_address(req->dst);
+ out_options = 0;
} else {
dst_dma = edesc->sec4_sg_dma +
sec4_sg_index *