Commit 309a18ae 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 bugfix from Herbert Xu:
 "Fix a bug in the cryptd code that may lead to crashes"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: cryptd - initialize child shash_desc on import
parents e8988e05 0bd22235

crypto/cryptd.c

+7 −2
Original line number Diff line number Diff line
@@ -631,9 +631,14 @@ static int cryptd_hash_export(struct ahash_request *req, void *out) 


static int cryptd_hash_import(struct ahash_request *req, const void *in)

{

	struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

	struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(tfm);

	struct shash_desc *desc = cryptd_shash_desc(req);



	desc->tfm = ctx->child;

	desc->flags = req->base.flags;



	return crypto_shash_import(&rctx->desc, in);

	return crypto_shash_import(desc, in);

}



static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,