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 | dc5bc3f1e3d886ce1193281bb2bfb2b44f4aeae4 (patch) | |
| tree | a64ded6cacafc9dcece90e102fd6d67b4cd47a28 /crypto/crypto_user.c | |
| parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux (diff) | |
| parent | crypto: api - Only abort operations on fatal signal (diff) | |
| download | linux-dev-dc5bc3f1e3d886ce1193281bb2bfb2b44f4aeae4.tar.xz linux-dev-dc5bc3f1e3d886ce1193281bb2bfb2b44f4aeae4.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/crypto_user.c')
| -rw-r--r-- | crypto/crypto_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c index d94d99ffe8b9..237f3795cfaa 100644 --- a/crypto/crypto_user.c +++ b/crypto/crypto_user.c @@ -375,7 +375,7 @@ static struct crypto_alg *crypto_user_skcipher_alg(const char *name, u32 type, err = PTR_ERR(alg); if (err != -EAGAIN) break; - if (signal_pending(current)) { + if (fatal_signal_pending(current)) { err = -EINTR; break; } |