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

Commit 586fac13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  padata: Allocate the cpumask for the padata instance
  crypto: authenc - Move saved IV in front of the ablkcipher request
  crypto: hash - Fix handling of unaligned buffers
  crypto: authenc - Use correct ahash complete functions
  crypto: md5 - Set statesize
parents 1f63b9c1 74781387

crypto/ahash.c

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err) 
	walk->data -= walk->offset;



	if (nbytes && walk->offset & alignmask && !err) {

		walk->offset += alignmask - 1;

		walk->offset = ALIGN(walk->offset, alignmask + 1);

		walk->data += walk->offset;

crypto/authenc.c

+15 −12
Original line number Diff line number Diff line
@@ -386,11 +386,13 @@ static int crypto_authenc_encrypt(struct aead_request *req) 
{

	struct crypto_aead *authenc = crypto_aead_reqtfm(req);

	struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);

	struct ablkcipher_request *abreq = aead_request_ctx(req);

	struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);

	struct crypto_ablkcipher *enc = ctx->enc;

	struct scatterlist *dst = req->dst;

	unsigned int cryptlen = req->cryptlen;

	u8 *iv = (u8 *)(abreq + 1) + crypto_ablkcipher_reqsize(enc);

	struct ablkcipher_request *abreq = (void *)(areq_ctx->tail

						    + ctx->reqoff);

	u8 *iv = (u8 *)abreq - crypto_ablkcipher_ivsize(enc);

	int err;



	ablkcipher_request_set_tfm(abreq, enc);
@@ -454,7 +456,7 @@ static int crypto_authenc_verify(struct aead_request *req, 
	unsigned int authsize;



	areq_ctx->complete = authenc_verify_ahash_done;

	areq_ctx->complete = authenc_verify_ahash_update_done;

	areq_ctx->update_complete = authenc_verify_ahash_update_done;



	ohash = authenc_ahash_fn(req, CRYPTO_TFM_REQ_MAY_SLEEP);

	if (IS_ERR(ohash))
@@ -546,10 +548,6 @@ static int crypto_authenc_init_tfm(struct crypto_tfm *tfm) 
	if (IS_ERR(auth))

		return PTR_ERR(auth);



	ctx->reqoff = ALIGN(2 * crypto_ahash_digestsize(auth) +

			    crypto_ahash_alignmask(auth),

			    crypto_ahash_alignmask(auth) + 1);



	enc = crypto_spawn_skcipher(&ictx->enc);

	err = PTR_ERR(enc);

	if (IS_ERR(enc))
@@ -558,13 +556,18 @@ static int crypto_authenc_init_tfm(struct crypto_tfm *tfm) 
	ctx->auth = auth;

	ctx->enc = enc;



	tfm->crt_aead.reqsize = max_t(unsigned int,

				crypto_ahash_reqsize(auth) + ctx->reqoff +

				sizeof(struct authenc_request_ctx) +

	ctx->reqoff = ALIGN(2 * crypto_ahash_digestsize(auth) +

			    crypto_ahash_alignmask(auth),

			    crypto_ahash_alignmask(auth) + 1) +

		      crypto_ablkcipher_ivsize(enc);



	tfm->crt_aead.reqsize = sizeof(struct authenc_request_ctx) +

				ctx->reqoff +

				max_t(unsigned int,

				crypto_ahash_reqsize(auth) +

				sizeof(struct ahash_request),

				sizeof(struct skcipher_givcrypt_request) +

				crypto_ablkcipher_reqsize(enc) +

				crypto_ablkcipher_ivsize(enc));

				crypto_ablkcipher_reqsize(enc));



	return 0;

crypto/md5.c

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ static struct shash_alg alg = { 
	.export		=	md5_export,

	.import		=	md5_import,

	.descsize	=	sizeof(struct md5_state),

	.statesize	=	sizeof(struct md5_state),

	.base		=	{

		.cra_name	=	"md5",

		.cra_flags	=	CRYPTO_ALG_TYPE_SHASH,

kernel/padata.c

+7 −1
Original line number Diff line number Diff line
@@ -642,6 +642,9 @@ struct padata_instance *padata_alloc(const struct cpumask *cpumask, 
	if (!pd)

		goto err_free_inst;



	if (!alloc_cpumask_var(&pinst->cpumask, GFP_KERNEL))

		goto err_free_pd;



	rcu_assign_pointer(pinst->pd, pd);



	pinst->wq = wq;
@@ -654,12 +657,14 @@ struct padata_instance *padata_alloc(const struct cpumask *cpumask, 
	pinst->cpu_notifier.priority = 0;

	err = register_hotcpu_notifier(&pinst->cpu_notifier);

	if (err)

		goto err_free_pd;

		goto err_free_cpumask;



	mutex_init(&pinst->lock);



	return pinst;



err_free_cpumask:

	free_cpumask_var(pinst->cpumask);

err_free_pd:

	padata_free_pd(pd);

err_free_inst:
@@ -685,6 +690,7 @@ void padata_free(struct padata_instance *pinst) 


	unregister_hotcpu_notifier(&pinst->cpu_notifier);

	padata_free_pd(pinst->pd);

	free_cpumask_var(pinst->cpumask);

	kfree(pinst);

}

EXPORT_SYMBOL(padata_free);