diff options
| author | Gilad Ben-Yossef <gilad@benyossef.com> | 2017-06-28 10:22:03 +0300 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-07-31 13:37:55 -0400 |
| commit | f04dc46b10998384d1726da0aa319c075503fd53 (patch) | |
| tree | 5953fd772f923b3d6c15ef187f931e7ede757740 | |
| parent | 05398f6df94a0acb2e43f8bb8dfe74cbe42e824c (diff) | |
| download | linux-f04dc46b10998384d1726da0aa319c075503fd53.tar.gz linux-f04dc46b10998384d1726da0aa319c075503fd53.tar.bz2 linux-f04dc46b10998384d1726da0aa319c075503fd53.zip | |
crypto: atmel - only treat EBUSY as transient if backlog
[ Upstream commit 1606043f214f912a52195293614935811a6e3e53 ]
The Atmel SHA driver was treating -EBUSY as indication of queueing
to backlog without checking that backlog is enabled for the request.
Fix it by checking request flags.
Cc: <stable@vger.kernel.org>
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | drivers/crypto/atmel-sha.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c index 3178f84d2757..6bff78c5c032 100644 --- a/drivers/crypto/atmel-sha.c +++ b/drivers/crypto/atmel-sha.c @@ -963,7 +963,9 @@ static int atmel_sha_finup(struct ahash_request *req) ctx->flags |= SHA_FLAGS_FINUP; err1 = atmel_sha_update(req); - if (err1 == -EINPROGRESS || err1 == -EBUSY) + if (err1 == -EINPROGRESS || + (err1 == -EBUSY && (ahash_request_flags(req) & + CRYPTO_TFM_REQ_MAY_BACKLOG))) return err1; /* |