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

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
...@@ -455,6 +455,9 @@ void af_alg_complete(struct crypto_async_request *req, int err) ...@@ -455,6 +455,9 @@ void af_alg_complete(struct crypto_async_request *req, int err)
{ {
struct af_alg_completion *completion = req->data; struct af_alg_completion *completion = req->data;
if (err == -EINPROGRESS)
return;
completion->err = err; completion->err = err;
complete(&completion->completion); complete(&completion->completion);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment