aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-31 09:16:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-31 09:16:17 -0800
commit6ca793abf815d42bcb9022587c0df7691d779a9d (patch)
tree30a82abc0e6d6d73cb9ecd41bcae7bd27e2b16ed
parent9bb29b6b927bcd79cf185ee67bcebfe630f0dea1 (diff)
parent7e77bdebff5cb1e9876c561f69710b9ab8fa1f7e (diff)
downloadlinux-linaro-stable-6ca793abf815d42bcb9022587c0df7691d779a9d.tar.gz
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
-rw-r--r--crypto/af_alg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 1fa7bc31be63..4665b79c729a 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -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);
}