From: Steve Cornelius Date: Fri, 29 Jun 2012 22:53:46 +0000 (-0700) Subject: ENGR00215492-1: Fix DMA size in extended descriptor for ahash_digest() X-Git-Tag: v3.0.35-fsl_4.1.0~980 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ffd0093fa29da4c749aabccacbc943d3031c3fb6;p=karo-tx-linux.git ENGR00215492-1: Fix DMA size in extended descriptor for ahash_digest() Save of DMA size in extended descriptor was missing, thus crashes could occur during post-request unmapping. Also, removed lingering DEBUG def that shouldn't have been there. Signed-off-by: Steve Cornelius Signed-off-by: Terry Lv --- diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 85eaa95eda3e..d36582b0c072 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -89,7 +89,6 @@ #define HASH_MSG_LEN 8 #define MAX_CTX_LEN (HASH_MSG_LEN + SHA512_DIGEST_SIZE) -#define DEBUG #ifdef DEBUG /* for print_hex_dumps with line references */ #define xstr(s) str(s) @@ -1095,6 +1094,7 @@ static int ahash_digest(struct ahash_request *req) DESC_JOB_IO_LEN; edesc->sec4_sg_dma = dma_map_single(jrdev, edesc->sec4_sg, sec4_sg_bytes, DMA_TO_DEVICE); + edesc->sec4_sg_bytes = sec4_sg_bytes; dma_sync_single_for_device(jrdev, edesc->sec4_sg_dma, sec4_sg_bytes, DMA_TO_DEVICE); edesc->src_nents = src_nents;