Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23aabe73 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 23400ac9 c8467f7a

crypto/algif_hash.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

crypto/scatterwalk.c

+0 −4
Original line number Diff line number Diff line
@@ -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);