Commit dcf903d0 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:

 - fix new compiler warnings in cavium

 - set post-op IV properly in caam (this fixes chaining)

 - fix potential use-after-free in atmel in case of EBUSY

 - fix sleeping in softirq path in chcr

 - disable buggy sha1-avx2 driver (may overread and page fault)

 - fix use-after-free on signals in caam

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: cavium - make several functions static
  crypto: chcr - Avoid algo allocation in softirq.
  crypto: caam - properly set IV after {en,de}crypt
  crypto: atmel - only treat EBUSY as transient if backlog
  crypto: af_alg - Avoid sock_graft call warning
  crypto: caam - fix signals handling
  crypto: sha1-ssse3 - Disable avx2
parents 96d0d831 b8fc3397

arch/x86/crypto/sha1_ssse3_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ asmlinkage void sha1_transform_avx2(u32 *digest, const char *data, 


static bool avx2_usable(void)

{

	if (avx_usable() && boot_cpu_has(X86_FEATURE_AVX2)

	if (false && avx_usable() && boot_cpu_has(X86_FEATURE_AVX2)

		&& boot_cpu_has(X86_FEATURE_BMI1)

		&& boot_cpu_has(X86_FEATURE_BMI2))

		return true;

crypto/af_alg.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock, bool kern) 
		goto unlock;



	sock_init_data(newsock, sk2);

	sock_graft(sk2, newsock);

	security_sock_graft(sk2, newsock);

	security_sk_clone(sk, sk2);



	err = type->accept(ask->private, sk2);

drivers/crypto/atmel-sha.c

+3 −1
Original line number Diff line number Diff line
@@ -1204,7 +1204,9 @@ static int atmel_sha_finup(struct ahash_request *req) 
	ctx->flags |= SHA_FLAGS_FINUP;



	err1 = atmel_sha_update(req);

	if (err1 == -EINPROGRESS || err1 == -EBUSY)

	if (err1 == -EINPROGRESS ||

	    (err1 == -EBUSY && (ahash_request_flags(req) &

				CRYPTO_TFM_REQ_MAY_BACKLOG)))

		return err1;



	/*

drivers/crypto/caam/caamalg.c

+18 −2
Original line number Diff line number Diff line
@@ -882,10 +882,10 @@ static void ablkcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err, 
{

	struct ablkcipher_request *req = context;

	struct ablkcipher_edesc *edesc;

#ifdef DEBUG

	struct crypto_ablkcipher *ablkcipher = crypto_ablkcipher_reqtfm(req);

	int ivsize = crypto_ablkcipher_ivsize(ablkcipher);



#ifdef DEBUG

	dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err);

#endif
@@ -904,6 +904,14 @@ static void ablkcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err, 
#endif



	ablkcipher_unmap(jrdev, edesc, req);



	/*

	 * The crypto API expects us to set the IV (req->info) to the last

	 * ciphertext block. This is used e.g. by the CTS mode.

	 */

	scatterwalk_map_and_copy(req->info, req->dst, req->nbytes - ivsize,

				 ivsize, 0);



	kfree(edesc);



	ablkcipher_request_complete(req, err);
@@ -914,10 +922,10 @@ static void ablkcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err, 
{

	struct ablkcipher_request *req = context;

	struct ablkcipher_edesc *edesc;

#ifdef DEBUG

	struct crypto_ablkcipher *ablkcipher = crypto_ablkcipher_reqtfm(req);

	int ivsize = crypto_ablkcipher_ivsize(ablkcipher);



#ifdef DEBUG

	dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err);

#endif
@@ -935,6 +943,14 @@ static void ablkcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err, 
#endif



	ablkcipher_unmap(jrdev, edesc, req);



	/*

	 * The crypto API expects us to set the IV (req->info) to the last

	 * ciphertext block.

	 */

	scatterwalk_map_and_copy(req->info, req->src, req->nbytes - ivsize,

				 ivsize, 0);



	kfree(edesc);



	ablkcipher_request_complete(req, err);

drivers/crypto/caam/caamhash.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in, 
	ret = caam_jr_enqueue(jrdev, desc, split_key_done, &result);

	if (!ret) {

		/* in progress */

		wait_for_completion_interruptible(&result.completion);

		wait_for_completion(&result.completion);

		ret = result.err;

#ifdef DEBUG

		print_hex_dump(KERN_ERR,

CRA Git | Maintained and supported by SUSTech CRA and CCSE