aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDave Kleikamp <dave.kleikamp@oracle.com>2015-10-05 11:08:51 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2015-10-08 09:36:48 -0400
commita66d7f724a96d6fd279bfbd2ee488def6b081bea (patch)
tree2a5694986c166829d4959eaafe217491c9944abc /arch
parent09185e2756a83763bcbfe51b308b85979f0de027 (diff)
crypto: sparc - initialize blkcipher.ivsize
Some of the crypto algorithms write to the initialization vector, but no space has been allocated for it. This clobbers adjacent memory. Cc: stable@vger.kernel.org Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/crypto/aes_glue.c2
-rw-r--r--arch/sparc/crypto/camellia_glue.c1
-rw-r--r--arch/sparc/crypto/des_glue.c2
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/sparc/crypto/aes_glue.c b/arch/sparc/crypto/aes_glue.c
index 2e48eb8813ff..c90930de76ba 100644
--- a/arch/sparc/crypto/aes_glue.c
+++ b/arch/sparc/crypto/aes_glue.c
@@ -433,6 +433,7 @@ static struct crypto_alg algs[] = { {
433 .blkcipher = { 433 .blkcipher = {
434 .min_keysize = AES_MIN_KEY_SIZE, 434 .min_keysize = AES_MIN_KEY_SIZE,
435 .max_keysize = AES_MAX_KEY_SIZE, 435 .max_keysize = AES_MAX_KEY_SIZE,
436 .ivsize = AES_BLOCK_SIZE,
436 .setkey = aes_set_key, 437 .setkey = aes_set_key,
437 .encrypt = cbc_encrypt, 438 .encrypt = cbc_encrypt,
438 .decrypt = cbc_decrypt, 439 .decrypt = cbc_decrypt,
@@ -452,6 +453,7 @@ static struct crypto_alg algs[] = { {
452 .blkcipher = { 453 .blkcipher = {
453 .min_keysize = AES_MIN_KEY_SIZE, 454 .min_keysize = AES_MIN_KEY_SIZE,
454 .max_keysize = AES_MAX_KEY_SIZE, 455 .max_keysize = AES_MAX_KEY_SIZE,
456 .ivsize = AES_BLOCK_SIZE,
455 .setkey = aes_set_key, 457 .setkey = aes_set_key,
456 .encrypt = ctr_crypt, 458 .encrypt = ctr_crypt,
457 .decrypt = ctr_crypt, 459 .decrypt = ctr_crypt,
diff --git a/arch/sparc/crypto/camellia_glue.c b/arch/sparc/crypto/camellia_glue.c
index 6bf2479a12fb..561a84d93cf6 100644
--- a/arch/sparc/crypto/camellia_glue.c
+++ b/arch/sparc/crypto/camellia_glue.c
@@ -274,6 +274,7 @@ static struct crypto_alg algs[] = { {
274 .blkcipher = { 274 .blkcipher = {
275 .min_keysize = CAMELLIA_MIN_KEY_SIZE, 275 .min_keysize = CAMELLIA_MIN_KEY_SIZE,
276 .max_keysize = CAMELLIA_MAX_KEY_SIZE, 276 .max_keysize = CAMELLIA_MAX_KEY_SIZE,
277 .ivsize = CAMELLIA_BLOCK_SIZE,
277 .setkey = camellia_set_key, 278 .setkey = camellia_set_key,
278 .encrypt = cbc_encrypt, 279 .encrypt = cbc_encrypt,
279 .decrypt = cbc_decrypt, 280 .decrypt = cbc_decrypt,
diff --git a/arch/sparc/crypto/des_glue.c b/arch/sparc/crypto/des_glue.c
index dd6a34fa6e19..61af794aa2d3 100644
--- a/arch/sparc/crypto/des_glue.c
+++ b/arch/sparc/crypto/des_glue.c
@@ -429,6 +429,7 @@ static struct crypto_alg algs[] = { {
429 .blkcipher = { 429 .blkcipher = {
430 .min_keysize = DES_KEY_SIZE, 430 .min_keysize = DES_KEY_SIZE,
431 .max_keysize = DES_KEY_SIZE, 431 .max_keysize = DES_KEY_SIZE,
432 .ivsize = DES_BLOCK_SIZE,
432 .setkey = des_set_key, 433 .setkey = des_set_key,
433 .encrypt = cbc_encrypt, 434 .encrypt = cbc_encrypt,
434 .decrypt = cbc_decrypt, 435 .decrypt = cbc_decrypt,
@@ -485,6 +486,7 @@ static struct crypto_alg algs[] = { {
485 .blkcipher = { 486 .blkcipher = {
486 .min_keysize = DES3_EDE_KEY_SIZE, 487 .min_keysize = DES3_EDE_KEY_SIZE,
487 .max_keysize = DES3_EDE_KEY_SIZE, 488 .max_keysize = DES3_EDE_KEY_SIZE,
489 .ivsize = DES3_EDE_BLOCK_SIZE,
488 .setkey = des3_ede_set_key, 490 .setkey = des3_ede_set_key,
489 .encrypt = cbc3_encrypt, 491 .encrypt = cbc3_encrypt,
490 .decrypt = cbc3_decrypt, 492 .decrypt = cbc3_decrypt,