tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 23aabe73 23400ac9

+1 -5
+1 -1
crypto/algif_hash.c
··· 214 214 215 215 ahash_request_set_crypt(&ctx->req, NULL, ctx->result, 0); 216 216 217 - if (!result) { 217 + if (!result && !ctx->more) { 218 218 err = af_alg_wait_for_completion( 219 219 crypto_ahash_init(&ctx->req), 220 220 &ctx->completion);
-4
crypto/scatterwalk.c
··· 68 68 69 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 71 scatterwalk_start(&walk, sg); 76 72 scatterwalk_copychunks(buf, &walk, nbytes, out); 77 73 scatterwalk_done(&walk, out, 0);