diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-28 07:20:10 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-28 07:20:10 +0900 |
| commit | fbac254eaaaf03131033caa87420f9af2e273907 (patch) | |
| tree | 766d1422054a6dc11ed1f04619bd0936991dfd68 /crypto/algapi.c | |
| parent | 64ad00c1c4480363927292d212e3f49cbeeea00d (diff) | |
| parent | 5ce0e962b1ddc14a797732047b9a10c544b818d1 (diff) | |
| download | linux-crypto-fbac254eaaaf03131033caa87420f9af2e273907.tar.gz linux-crypto-fbac254eaaaf03131033caa87420f9af2e273907.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a problem in the Crypto API that may cause spurious errors
when signals are received by the process that made the orignal system
call into the kernel"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: api - Only abort operations on fatal signal
Diffstat (limited to 'crypto/algapi.c')
| -rw-r--r-- | crypto/algapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index d130b41d..59bf491f 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -345,7 +345,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval) crypto_alg_tested(larval->alg.cra_driver_name, 0); } - err = wait_for_completion_interruptible(&larval->completion); + err = wait_for_completion_killable(&larval->completion); WARN_ON(err); out: |