OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
9bb29b6
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 31 Dec 2014 17:16:17 +0000
(09:16 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 31 Dec 2014 17:16:17 +0000
(09:16 -0800)
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
crypto/af_alg.c
patch
|
blob
|
history
diff --git
a/crypto/af_alg.c
b/crypto/af_alg.c
index
1fa7bc3
..
4665b79
100644
(file)
--- 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);
}