tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] api: fix writting into unallocated memory in setkey_aligned

Linus Torvalds f27eb3af 6f605d83

+4 -4
unified split
+1 -1
crypto/ablkcipher.c
··· 35 alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); 36 memcpy(alignbuffer, key, keylen); 37 ret = cipher->setkey(tfm, alignbuffer, keylen); 38 - memset(alignbuffer, 0, absize); 39 kfree(buffer); 40 return ret; 41 }
··· 35 alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); 36 memcpy(alignbuffer, key, keylen); 37 ret = cipher->setkey(tfm, alignbuffer, keylen); 38 + memset(alignbuffer, 0, keylen); 39 kfree(buffer); 40 return ret; 41 }
+1 -1
crypto/blkcipher.c
··· 352 alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); 353 memcpy(alignbuffer, key, keylen); 354 ret = cipher->setkey(tfm, alignbuffer, keylen); 355 - memset(alignbuffer, 0, absize); 356 kfree(buffer); 357 return ret; 358 }
··· 352 alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); 353 memcpy(alignbuffer, key, keylen); 354 ret = cipher->setkey(tfm, alignbuffer, keylen); 355 + memset(alignbuffer, 0, keylen); 356 kfree(buffer); 357 return ret; 358 }
+1 -1
crypto/cipher.c
··· 36 alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); 37 memcpy(alignbuffer, key, keylen); 38 ret = cia->cia_setkey(tfm, alignbuffer, keylen); 39 - memset(alignbuffer, 0, absize); 40 kfree(buffer); 41 return ret; 42
··· 36 alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); 37 memcpy(alignbuffer, key, keylen); 38 ret = cia->cia_setkey(tfm, alignbuffer, keylen); 39 + memset(alignbuffer, 0, keylen); 40 kfree(buffer); 41 return ret; 42
+1 -1
crypto/hash.c
··· 40 alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); 41 memcpy(alignbuffer, key, keylen); 42 ret = alg->setkey(crt, alignbuffer, keylen); 43 - memset(alignbuffer, 0, absize); 44 kfree(buffer); 45 return ret; 46 }
··· 40 alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); 41 memcpy(alignbuffer, key, keylen); 42 ret = alg->setkey(crt, alignbuffer, keylen); 43 + memset(alignbuffer, 0, keylen); 44 kfree(buffer); 45 return ret; 46 }