diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 11:05:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 11:05:18 -0700 |
| commit | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (patch) | |
| tree | c5b9258be43d7f4e2ec1d91e4b83820562fbaebb /drivers/crypto/caam/caamhash.c | |
| parent | 04012e3076943f17c8cfc77a196701c8f0b8964f (diff) | |
| parent | e70308ec0e4bff344fcfdf160de40e1150552c5f (diff) | |
| download | kernel_goldelico_gta04-b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73.zip kernel_goldelico_gta04-b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73.tar.gz kernel_goldelico_gta04-b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes a memory corruption issue in caam, as well as
reverting the new optimised crct10dif implementation as it breaks boot
on initrd systems.
Hopefully crct10dif will be reinstated once the supporting code is
added so that it doesn't break boot"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
crypto: caam - Fixed the memory out of bound overwrite issue
Diffstat (limited to 'drivers/crypto/caam/caamhash.c')
| -rw-r--r-- | drivers/crypto/caam/caamhash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 5996521..84573b4 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -429,7 +429,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in, dma_addr_t src_dma, dst_dma; int ret = 0; - desc = kmalloc(CAAM_CMD_SZ * 6 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA); + desc = kmalloc(CAAM_CMD_SZ * 8 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA); if (!desc) { dev_err(jrdev, "unable to allocate key input memory\n"); return -ENOMEM; |