diff options
author | Horia Geantă <horia.geanta@nxp.com> | 2017-11-01 03:13:10 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-11-06 01:45:00 -0500 |
commit | f2ac67746534fab0cbc0bc29bfc3e507b1f58474 (patch) | |
tree | adf172a0dcc5f0ecb75dbeedec45ace156619cf5 | |
parent | 7a373fd74a8d1c4882e0236cc38345cec1393505 (diff) |
crypto: caam - remove unneeded edesc zeroization
Extended descriptor allocation has been changed by
commit dde20ae9d6383 ("crypto: caam - Change kmalloc to kzalloc to avoid residual data")
to provide zeroized memory, meaning we no longer have to sanitize
its members - edesc->src_nents and edesc->dst_dma.
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | drivers/crypto/caam/caamhash.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 698580b60b2f..7b1167437b88 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c | |||
@@ -871,7 +871,6 @@ static int ahash_final_ctx(struct ahash_request *req) | |||
871 | desc = edesc->hw_desc; | 871 | desc = edesc->hw_desc; |
872 | 872 | ||
873 | edesc->sec4_sg_bytes = sec4_sg_bytes; | 873 | edesc->sec4_sg_bytes = sec4_sg_bytes; |
874 | edesc->src_nents = 0; | ||
875 | 874 | ||
876 | ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len, | 875 | ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len, |
877 | edesc->sec4_sg, DMA_TO_DEVICE); | 876 | edesc->sec4_sg, DMA_TO_DEVICE); |
@@ -1123,7 +1122,6 @@ static int ahash_final_no_ctx(struct ahash_request *req) | |||
1123 | dev_err(jrdev, "unable to map dst\n"); | 1122 | dev_err(jrdev, "unable to map dst\n"); |
1124 | goto unmap; | 1123 | goto unmap; |
1125 | } | 1124 | } |
1126 | edesc->src_nents = 0; | ||
1127 | 1125 | ||
1128 | #ifdef DEBUG | 1126 | #ifdef DEBUG |
1129 | print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", | 1127 | print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ", |
@@ -1205,7 +1203,6 @@ static int ahash_update_no_ctx(struct ahash_request *req) | |||
1205 | 1203 | ||
1206 | edesc->src_nents = src_nents; | 1204 | edesc->src_nents = src_nents; |
1207 | edesc->sec4_sg_bytes = sec4_sg_bytes; | 1205 | edesc->sec4_sg_bytes = sec4_sg_bytes; |
1208 | edesc->dst_dma = 0; | ||
1209 | 1206 | ||
1210 | ret = buf_map_to_sec4_sg(jrdev, edesc->sec4_sg, state); | 1207 | ret = buf_map_to_sec4_sg(jrdev, edesc->sec4_sg, state); |
1211 | if (ret) | 1208 | if (ret) |
@@ -1417,7 +1414,6 @@ static int ahash_update_first(struct ahash_request *req) | |||
1417 | } | 1414 | } |
1418 | 1415 | ||
1419 | edesc->src_nents = src_nents; | 1416 | edesc->src_nents = src_nents; |
1420 | edesc->dst_dma = 0; | ||
1421 | 1417 | ||
1422 | ret = ahash_edesc_add_src(ctx, edesc, req, mapped_nents, 0, 0, | 1418 | ret = ahash_edesc_add_src(ctx, edesc, req, mapped_nents, 0, 0, |
1423 | to_hash); | 1419 | to_hash); |