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

Commit fd008d1a 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 fix from Herbert Xu:
 "This fixes a bug in the implementation of xcbc and cmac in caam"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - fix copy of next buffer for xcbc and cmac
parents fcf88917 b4e9e931

drivers/crypto/caam/caamhash.c

+6 −7
Original line number Diff line number Diff line
@@ -865,19 +865,18 @@ static int ahash_update_ctx(struct ahash_request *req) 
		if (ret)

			goto unmap_ctx;



		if (mapped_nents) {

		if (mapped_nents)

			sg_to_sec4_sg_last(req->src, mapped_nents,

					   edesc->sec4_sg + sec4_sg_src_index,

					   0);

		else

			sg_to_sec4_set_last(edesc->sec4_sg + sec4_sg_src_index -

					    1);



		if (*next_buflen)

			scatterwalk_map_and_copy(next_buf, req->src,

						 to_hash - *buflen,

						 *next_buflen, 0);

		} else {

			sg_to_sec4_set_last(edesc->sec4_sg + sec4_sg_src_index -

					    1);

		}



		desc = edesc->hw_desc;



		edesc->sec4_sg_dma = dma_map_single(jrdev, edesc->sec4_sg,