summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorGilad Ben-Yossef <gilad@benyossef.com>2017-05-18 16:29:23 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-14 15:05:54 +0200
commit0e479742e8d195b57d63a5acbb53df04929d603c (patch)
tree528bcbe7d121d6cc928dcc6925b4cfc6fe01800c /crypto
parent7c24a70c70b7a1ff71cbf410358c6c45daccdc74 (diff)
downloadlinux-stable-0e479742e8d195b57d63a5acbb53df04929d603c.tar.gz
linux-stable-0e479742e8d195b57d63a5acbb53df04929d603c.tar.bz2
linux-stable-0e479742e8d195b57d63a5acbb53df04929d603c.zip
crypto: asymmetric_keys - handle EBUSY due to backlog correctly
commit e68368aed56324e2e38d4f6b044bb8cf82077fc2 upstream. public_key_verify_signature() was passing the CRYPTO_TFM_REQ_MAY_BACKLOG flag to akcipher_request_set_callback() but was not handling correctly the case where a -EBUSY error could be returned from the call to crypto_akcipher_verify() if backlog was used, possibly casuing data corruption due to use-after-free of buffers. Resolve this by handling -EBUSY correctly. Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/asymmetric_keys/public_key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c
index fd76b5fc3b3a..4955eb66e361 100644
--- a/crypto/asymmetric_keys/public_key.c
+++ b/crypto/asymmetric_keys/public_key.c
@@ -140,7 +140,7 @@ int public_key_verify_signature(const struct public_key *pkey,
* signature and returns that to us.
*/
ret = crypto_akcipher_verify(req);
- if (ret == -EINPROGRESS) {
+ if ((ret == -EINPROGRESS) || (ret == -EBUSY)) {
wait_for_completion(&compl.completion);
ret = compl.err;
}