lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] api: fix writting into unallocated memory in setkey_aligned
This commit is contained in:
Linus Torvalds
2007-08-06 18:25:06 -07:00
parent 6f605d83dd 0681717678
commit f27eb3afe8
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/ablkcipher.c
View File

@@ -35,7 +35,7 @@ static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key, unsign
alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
memcpy(alignbuffer, key, keylen); memcpy(alignbuffer, key, keylen);
ret = cipher->setkey(tfm, alignbuffer, keylen); ret = cipher->setkey(tfm, alignbuffer, keylen);
memset(alignbuffer, 0, absize); memset(alignbuffer, 0, keylen);
kfree(buffer); kfree(buffer);
return ret; return ret;
} }

2
crypto/blkcipher.c
View File

@@ -352,7 +352,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int
alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
memcpy(alignbuffer, key, keylen); memcpy(alignbuffer, key, keylen);
ret = cipher->setkey(tfm, alignbuffer, keylen); ret = cipher->setkey(tfm, alignbuffer, keylen);
memset(alignbuffer, 0, absize); memset(alignbuffer, 0, keylen);
kfree(buffer); kfree(buffer);
return ret; return ret;
} }

2
crypto/cipher.c
View File

@@ -36,7 +36,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int
alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
memcpy(alignbuffer, key, keylen); memcpy(alignbuffer, key, keylen);
ret = cia->cia_setkey(tfm, alignbuffer, keylen); ret = cia->cia_setkey(tfm, alignbuffer, keylen);
memset(alignbuffer, 0, absize); memset(alignbuffer, 0, keylen);
kfree(buffer); kfree(buffer);
return ret; return ret;

2
crypto/hash.c
View File

@@ -40,7 +40,7 @@ static int hash_setkey_unaligned(struct crypto_hash *crt, const u8 *key,
alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
memcpy(alignbuffer, key, keylen); memcpy(alignbuffer, key, keylen);
ret = alg->setkey(crt, alignbuffer, keylen); ret = alg->setkey(crt, alignbuffer, keylen);
memset(alignbuffer, 0, absize); memset(alignbuffer, 0, keylen);
kfree(buffer); kfree(buffer);
return ret; return ret;
} }