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

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
Linus Torvalds
2 parents 9bb29b6b92 7e77bdebff
Showing 1 changed file Side-by-side Diff
crypto/af_alg.c
@@ -455,6 +455,9 @@
 {
 	struct af_alg_completion *completion = req->data;
  
+	if (err == -EINPROGRESS)
+		return;
+
 	completion->err = err;
 	complete(&completion->completion);
 }
...	...	@@ -455,6 +455,9 @@
455	455	{
456	456	struct af_alg_completion *completion = req->data;
457	457
	458	+ if (err == -EINPROGRESS)
	459	+ return;
	460	+
458	461	completion->err = err;
459	462	complete(&completion->completion);
460	463	}