diff options
| -rw-r--r-- | crypto/algif_hash.c | 2 | ||||
| -rw-r--r-- | crypto/scatterwalk.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 05e21b464433..d19b09cdf284 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c | |||
| @@ -214,7 +214,7 @@ static int hash_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, | |||
| 214 | 214 | ||
| 215 | ahash_request_set_crypt(&ctx->req, NULL, ctx->result, 0); | 215 | ahash_request_set_crypt(&ctx->req, NULL, ctx->result, 0); |
| 216 | 216 | ||
| 217 | if (!result) { | 217 | if (!result && !ctx->more) { |
| 218 | err = af_alg_wait_for_completion( | 218 | err = af_alg_wait_for_completion( |
| 219 | crypto_ahash_init(&ctx->req), | 219 | crypto_ahash_init(&ctx->req), |
| 220 | &ctx->completion); | 220 | &ctx->completion); |
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c index 52ce17a3dd63..c16c94f88733 100644 --- a/crypto/scatterwalk.c +++ b/crypto/scatterwalk.c | |||
| @@ -68,10 +68,6 @@ void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg, | |||
| 68 | 68 | ||
| 69 | sg = scatterwalk_ffwd(tmp, sg, start); | 69 | sg = scatterwalk_ffwd(tmp, sg, start); |
| 70 | 70 | ||
| 71 | if (sg_page(sg) == virt_to_page(buf) && | ||
| 72 | sg->offset == offset_in_page(buf)) | ||
| 73 | return; | ||
| 74 | |||
| 75 | scatterwalk_start(&walk, sg); | 71 | scatterwalk_start(&walk, sg); |
| 76 | scatterwalk_copychunks(buf, &walk, nbytes, out); | 72 | scatterwalk_copychunks(buf, &walk, nbytes, out); |
| 77 | scatterwalk_done(&walk, out, 0); | 73 | scatterwalk_done(&walk, out, 0); |
