diff options
| author | Sebastian Siewior <sebastian@breakpoint.cc> | 2007-08-03 20:33:47 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2007-08-06 15:33:56 +0800 |
| commit | 06817176784f620984200dc5d7cbe16984f7b262 (patch) | |
| tree | 42de1788711cff6832c99a4f6a6518bb4f316935 | |
| parent | d4ac2477fad0f2680e84ec12e387ce67682c5c13 (diff) | |
| download | linux-3.10-06817176784f620984200dc5d7cbe16984f7b262.tar.gz linux-3.10-06817176784f620984200dc5d7cbe16984f7b262.tar.bz2 linux-3.10-06817176784f620984200dc5d7cbe16984f7b262.zip | |
[CRYPTO] api: fix writting into unallocated memory in setkey_aligned
setkey_unaligned() commited in ca7c39385ce1a7b44894a4b225a4608624e90730
overwrites unallocated memory in the following memset() because
I used the wrong buffer length.
Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/ablkcipher.c | 2 | ||||
| -rw-r--r-- | crypto/blkcipher.c | 2 | ||||
| -rw-r--r-- | crypto/cipher.c | 2 | ||||
| -rw-r--r-- | crypto/hash.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c index 1c166b47b4c..3dbb1cc6eab 100644 --- a/crypto/ablkcipher.c +++ b/crypto/ablkcipher.c @@ -35,7 +35,7 @@ static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key, unsign alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); memcpy(alignbuffer, key, keylen); ret = cipher->setkey(tfm, alignbuffer, keylen); - memset(alignbuffer, 0, absize); + memset(alignbuffer, 0, keylen); kfree(buffer); return ret; } diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 40a3dcff15b..7755834b884 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -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); memcpy(alignbuffer, key, keylen); ret = cipher->setkey(tfm, alignbuffer, keylen); - memset(alignbuffer, 0, absize); + memset(alignbuffer, 0, keylen); kfree(buffer); return ret; } diff --git a/crypto/cipher.c b/crypto/cipher.c index 0b2650c2014..fc6b46f2a9b 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c @@ -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); memcpy(alignbuffer, key, keylen); ret = cia->cia_setkey(tfm, alignbuffer, keylen); - memset(alignbuffer, 0, absize); + memset(alignbuffer, 0, keylen); kfree(buffer); return ret; diff --git a/crypto/hash.c b/crypto/hash.c index 4d75ca7b57b..4fd470bd729 100644 --- a/crypto/hash.c +++ b/crypto/hash.c @@ -40,7 +40,7 @@ static int hash_setkey_unaligned(struct crypto_hash *crt, const u8 *key, alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); memcpy(alignbuffer, key, keylen); ret = alg->setkey(crt, alignbuffer, keylen); - memset(alignbuffer, 0, absize); + memset(alignbuffer, 0, keylen); kfree(buffer); return ret; } |