Skip to content

Commit a66d7f7

Browse files
kleikampherbertx
authored andcommitted
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>
1 parent 09185e2 commit a66d7f7

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

arch/sparc/crypto/aes_glue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ static struct crypto_alg algs[] = { {
433433
.blkcipher = {
434434
.min_keysize = AES_MIN_KEY_SIZE,
435435
.max_keysize = AES_MAX_KEY_SIZE,
436+
.ivsize = AES_BLOCK_SIZE,
436437
.setkey = aes_set_key,
437438
.encrypt = cbc_encrypt,
438439
.decrypt = cbc_decrypt,
@@ -452,6 +453,7 @@ static struct crypto_alg algs[] = { {
452453
.blkcipher = {
453454
.min_keysize = AES_MIN_KEY_SIZE,
454455
.max_keysize = AES_MAX_KEY_SIZE,
456+
.ivsize = AES_BLOCK_SIZE,
455457
.setkey = aes_set_key,
456458
.encrypt = ctr_crypt,
457459
.decrypt = ctr_crypt,

arch/sparc/crypto/camellia_glue.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ static struct crypto_alg algs[] = { {
274274
.blkcipher = {
275275
.min_keysize = CAMELLIA_MIN_KEY_SIZE,
276276
.max_keysize = CAMELLIA_MAX_KEY_SIZE,
277+
.ivsize = CAMELLIA_BLOCK_SIZE,
277278
.setkey = camellia_set_key,
278279
.encrypt = cbc_encrypt,
279280
.decrypt = cbc_decrypt,

arch/sparc/crypto/des_glue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ static struct crypto_alg algs[] = { {
429429
.blkcipher = {
430430
.min_keysize = DES_KEY_SIZE,
431431
.max_keysize = DES_KEY_SIZE,
432+
.ivsize = DES_BLOCK_SIZE,
432433
.setkey = des_set_key,
433434
.encrypt = cbc_encrypt,
434435
.decrypt = cbc_decrypt,
@@ -485,6 +486,7 @@ static struct crypto_alg algs[] = { {
485486
.blkcipher = {
486487
.min_keysize = DES3_EDE_KEY_SIZE,
487488
.max_keysize = DES3_EDE_KEY_SIZE,
489+
.ivsize = DES3_EDE_BLOCK_SIZE,
488490
.setkey = des3_ede_set_key,
489491
.encrypt = cbc3_encrypt,
490492
.decrypt = cbc3_decrypt,

0 commit comments

Comments
 (0)