diff options
| author | Yin Honghua-R63875 <Hong-Hua.Yin@freescale.com> | 2015-11-09 02:29:12 (GMT) |
|---|---|---|
| committer | Yin Honghua-R63875 <Hong-Hua.Yin@freescale.com> | 2015-11-09 02:29:12 (GMT) |
| commit | a57ffba95b63f03f2af968b975dfd436a2d8ddfd (patch) | |
| tree | ca2b7856feb0e357594815d2ae20ba82be67e9a4 /drivers/crypto/caam/caamalg.c | |
| parent | 0586472f89a8bce6404900cc7efa69e64bdd33d4 (diff) | |
| parent | 8700bab2995ecc511d8db729e412a056be81e6b5 (diff) | |
| download | linux-fsl-qoriq-a57ffba95b63f03f2af968b975dfd436a2d8ddfd.tar.xz | |
Merge pull request #64 in SDK/linux-devel from ~B06830/linux-devel:bugfix/QSDK-2404-cryptodev-linux-sha1-offloading to master
* commit '8700bab2995ecc511d8db729e412a056be81e6b5':
crypto: caam - Change kmalloc to kzalloc to avoid residual data
crypto: caam - fix memory corruption in ahash_final_ctx
crypto: caam - Fix incorrect size when DMA unmapping buffer
crypto: caam - improve initalization for context state saves
Diffstat (limited to 'drivers/crypto/caam/caamalg.c')
| -rw-r--r-- | drivers/crypto/caam/caamalg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 0f117d0..023a5d8 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -3070,8 +3070,8 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, sec4_sg_bytes = sec4_sg_len * sizeof(struct sec4_sg_entry); /* allocate space for base edesc and hw desc commands, link tables */ - edesc = kmalloc(sizeof(struct aead_edesc) + desc_bytes + - sec4_sg_bytes, GFP_DMA | flags); + edesc = kzalloc(sizeof(*edesc) + desc_bytes + sec4_sg_bytes, + GFP_DMA | flags); if (!edesc) { dev_err(jrdev, "could not allocate extended descriptor\n"); return ERR_PTR(-ENOMEM); @@ -3310,8 +3310,8 @@ static struct aead_edesc *aead_giv_edesc_alloc(struct aead_givcrypt_request sec4_sg_bytes = sec4_sg_len * sizeof(struct sec4_sg_entry); /* allocate space for base edesc and hw desc commands, link tables */ - edesc = kmalloc(sizeof(struct aead_edesc) + desc_bytes + - sec4_sg_bytes, GFP_DMA | flags); + edesc = kzalloc(sizeof(*edesc) + desc_bytes + sec4_sg_bytes, + GFP_DMA | flags); if (!edesc) { dev_err(jrdev, "could not allocate extended descriptor\n"); return ERR_PTR(-ENOMEM); @@ -3581,8 +3581,8 @@ static struct ablkcipher_edesc *ablkcipher_edesc_alloc(struct ablkcipher_request sizeof(struct sec4_sg_entry); /* allocate space for base edesc and hw desc commands, link tables */ - edesc = kmalloc(sizeof(struct ablkcipher_edesc) + desc_bytes + - sec4_sg_bytes, GFP_DMA | flags); + edesc = kzalloc(sizeof(*edesc) + desc_bytes + sec4_sg_bytes, + GFP_DMA | flags); if (!edesc) { dev_err(jrdev, "could not allocate extended descriptor\n"); return ERR_PTR(-ENOMEM); |