Commit 6ca793ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull crypto fix from Herbert Xu:
 "Fix a use-after-free crash in the user-space crypto API"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: af_alg - fix backlog handling
parents 9bb29b6b 7e77bdeb

crypto/af_alg.c

+3 −0
Original line number Diff line number Diff line
@@ -455,6 +455,9 @@ void af_alg_complete(struct crypto_async_request *req, int err) 
{

	struct af_alg_completion *completion = req->data;



	if (err == -EINPROGRESS)

		return;



	completion->err = err;

	complete(&completion->completion);

}