diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-23 01:11:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-23 01:11:50 -0800 |
| commit | 23aabe73d53c29ee8da71397f87f190bdcde5b68 (patch) | |
| tree | 05a0365d3a344cd5f66caa26d4734248beedd741 | |
| parent | 23400ac997062647f2b63c82030d189671b1effe (diff) | |
| parent | c8467f7a3620698bf3c22f0e199b550fb611a8ae (diff) | |
| download | linux-kexec-23aabe73d53c29ee8da71397f87f190bdcde5b68.tar.gz | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"The last push broke algif_hash for all shash implementations, so this
is a follow-up to fix that.
This also fixes a problem in the crypto scatterwalk that triggers a
BUG_ON with certain debugging options due to the new vmalloced-stack
code"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: scatterwalk - Remove unnecessary aliasing check in map_and_copy
crypto: algif_hash - Fix result clobbering in recvmsg
| -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 05e21b46443300..d19b09cdf284d9 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, ahash_request_set_crypt(&ctx->req, NULL, ctx->result, 0); - if (!result) { + if (!result && !ctx->more) { err = af_alg_wait_for_completion( crypto_ahash_init(&ctx->req), &ctx->completion); diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c index 52ce17a3dd6307..c16c94f88733e7 100644 --- a/crypto/scatterwalk.c +++ b/crypto/scatterwalk.c @@ -68,10 +68,6 @@ void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg, sg = scatterwalk_ffwd(tmp, sg, start); - if (sg_page(sg) == virt_to_page(buf) && - sg->offset == offset_in_page(buf)) - return; - scatterwalk_start(&walk, sg); scatterwalk_copychunks(buf, &walk, nbytes, out); scatterwalk_done(&walk, out, 0); |