Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc4dee5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This fixes a regression in the cryptd code that breaks certain
  accelerated AED algorithms as well as an older regression in the
  caam driver that breaks IPsec"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - fix IV loading for authenc (giv)decryption
  crypto: cryptd - Use correct tfm object for AEAD tracking
parents 56291b27 8b18e235

crypto/cryptd.c

+2 −1
Original line number Diff line number Diff line
@@ -733,13 +733,14 @@ static void cryptd_aead_crypt(struct aead_request *req, 
	rctx = aead_request_ctx(req);

	compl = rctx->complete;



	tfm = crypto_aead_reqtfm(req);



	if (unlikely(err == -EINPROGRESS))

		goto out;

	aead_request_set_tfm(req, child);

	err = crypt( req );



out:

	tfm = crypto_aead_reqtfm(req);

	ctx = crypto_aead_ctx(tfm);

	refcnt = atomic_read(&ctx->refcnt);

drivers/crypto/caam/caamalg.c

+37 −40
Original line number Diff line number Diff line
@@ -556,6 +556,9 @@ static int aead_set_sh_desc(struct crypto_aead *aead) 


	/* Read and write assoclen bytes */

	append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);

	if (alg->caam.geniv)

		append_math_add_imm_u32(desc, VARSEQOUTLEN, REG3, IMM, ivsize);

	else

		append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);



	/* Skip assoc data */
@@ -565,6 +568,14 @@ static int aead_set_sh_desc(struct crypto_aead *aead) 
	append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG |

			     KEY_VLF);



	if (alg->caam.geniv) {

		append_seq_load(desc, ivsize, LDST_CLASS_1_CCB |

				LDST_SRCDST_BYTE_CONTEXT |

				(ctx1_iv_off << LDST_OFFSET_SHIFT));

		append_move(desc, MOVE_SRC_CLASS1CTX | MOVE_DEST_CLASS2INFIFO |

			    (ctx1_iv_off << MOVE_OFFSET_SHIFT) | ivsize);

	}



	/* Load Counter into CONTEXT1 reg */

	if (is_rfc3686)

		append_load_imm_u32(desc, be32_to_cpu(1), LDST_IMM |
@@ -2150,7 +2161,7 @@ static void init_authenc_job(struct aead_request *req, 


	init_aead_job(req, edesc, all_contig, encrypt);



	if (ivsize && (is_rfc3686 || !(alg->caam.geniv && encrypt)))

	if (ivsize && ((is_rfc3686 && encrypt) || !alg->caam.geniv))

		append_load_as_imm(desc, req->iv, ivsize,

				   LDST_CLASS_1_CCB |

				   LDST_SRCDST_BYTE_CONTEXT |
@@ -2537,20 +2548,6 @@ static int aead_decrypt(struct aead_request *req) 
	return ret;

}



static int aead_givdecrypt(struct aead_request *req)

{

	struct crypto_aead *aead = crypto_aead_reqtfm(req);

	unsigned int ivsize = crypto_aead_ivsize(aead);



	if (req->cryptlen < ivsize)

		return -EINVAL;



	req->cryptlen -= ivsize;

	req->assoclen += ivsize;



	return aead_decrypt(req);

}



/*

 * allocate and map the ablkcipher extended descriptor for ablkcipher

 */
@@ -3210,7 +3207,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = MD5_DIGEST_SIZE,

		},
@@ -3256,7 +3253,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = SHA1_DIGEST_SIZE,

		},
@@ -3302,7 +3299,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = SHA224_DIGEST_SIZE,

		},
@@ -3348,7 +3345,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = SHA256_DIGEST_SIZE,

		},
@@ -3394,7 +3391,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = SHA384_DIGEST_SIZE,

		},
@@ -3440,7 +3437,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = SHA512_DIGEST_SIZE,

		},
@@ -3486,7 +3483,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = MD5_DIGEST_SIZE,

		},
@@ -3534,7 +3531,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = SHA1_DIGEST_SIZE,

		},
@@ -3582,7 +3579,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = SHA224_DIGEST_SIZE,

		},
@@ -3630,7 +3627,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = SHA256_DIGEST_SIZE,

		},
@@ -3678,7 +3675,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = SHA384_DIGEST_SIZE,

		},
@@ -3726,7 +3723,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = SHA512_DIGEST_SIZE,

		},
@@ -3772,7 +3769,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES_BLOCK_SIZE,

			.maxauthsize = MD5_DIGEST_SIZE,

		},
@@ -3818,7 +3815,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES_BLOCK_SIZE,

			.maxauthsize = SHA1_DIGEST_SIZE,

		},
@@ -3864,7 +3861,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES_BLOCK_SIZE,

			.maxauthsize = SHA224_DIGEST_SIZE,

		},
@@ -3910,7 +3907,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES_BLOCK_SIZE,

			.maxauthsize = SHA256_DIGEST_SIZE,

		},
@@ -3956,7 +3953,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES_BLOCK_SIZE,

			.maxauthsize = SHA384_DIGEST_SIZE,

		},
@@ -4002,7 +3999,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = DES_BLOCK_SIZE,

			.maxauthsize = SHA512_DIGEST_SIZE,

		},
@@ -4051,7 +4048,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = CTR_RFC3686_IV_SIZE,

			.maxauthsize = MD5_DIGEST_SIZE,

		},
@@ -4102,7 +4099,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = CTR_RFC3686_IV_SIZE,

			.maxauthsize = SHA1_DIGEST_SIZE,

		},
@@ -4153,7 +4150,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = CTR_RFC3686_IV_SIZE,

			.maxauthsize = SHA224_DIGEST_SIZE,

		},
@@ -4204,7 +4201,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = CTR_RFC3686_IV_SIZE,

			.maxauthsize = SHA256_DIGEST_SIZE,

		},
@@ -4255,7 +4252,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = CTR_RFC3686_IV_SIZE,

			.maxauthsize = SHA384_DIGEST_SIZE,

		},
@@ -4306,7 +4303,7 @@ static struct caam_aead_alg driver_aeads[] = { 
			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_givdecrypt,

			.decrypt = aead_decrypt,

			.ivsize = CTR_RFC3686_IV_SIZE,

			.maxauthsize = SHA512_DIGEST_SIZE,

		},