Commit dde20ae9 authored by Victoria Milhoan's avatar Victoria Milhoan Committed by Herbert Xu
Browse files

crypto: caam - Change kmalloc to kzalloc to avoid residual data 



Since fields must be ORed in to operate correctly using any order of
operations, changed allocations of the combination of extended
descriptor structs + hardware scatterlists to use kzalloc() instead
of kmalloc(), so as to ensure that residue data would not be ORed in
with the correct data.

Signed-off-by: default avatarSteve Cornelius <steve.cornelius@freescale.com>
Signed-off-by: default avatarVictoria Milhoan <vicki.milhoan@freescale.com>
Tested-by: default avatarHoria Geantă <horia.geanta@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1f06ec1d

drivers/crypto/caam/caamalg.c

+6 −6
Original line number Diff line number Diff line
@@ -2199,8 +2199,8 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, 
	sec4_sg_bytes = sec4_sg_len * sizeof(struct sec4_sg_entry);



	/* allocate space for base edesc and hw desc commands, link tables */

	edesc = kzalloc(sizeof(struct aead_edesc) + desc_bytes +

			sec4_sg_bytes, GFP_DMA | flags);

	edesc = kzalloc(sizeof(*edesc) + desc_bytes + sec4_sg_bytes,

			GFP_DMA | flags);

	if (!edesc) {

		dev_err(jrdev, "could not allocate extended descriptor\n");

		return ERR_PTR(-ENOMEM);
@@ -2503,8 +2503,8 @@ static struct ablkcipher_edesc *ablkcipher_edesc_alloc(struct ablkcipher_request 
			sizeof(struct sec4_sg_entry);



	/* allocate space for base edesc and hw desc commands, link tables */

	edesc = kmalloc(sizeof(struct ablkcipher_edesc) + desc_bytes +

			sec4_sg_bytes, GFP_DMA | flags);

	edesc = kzalloc(sizeof(*edesc) + desc_bytes + sec4_sg_bytes,

			GFP_DMA | flags);

	if (!edesc) {

		dev_err(jrdev, "could not allocate extended descriptor\n");

		return ERR_PTR(-ENOMEM);
@@ -2682,8 +2682,8 @@ static struct ablkcipher_edesc *ablkcipher_giv_edesc_alloc( 
			sizeof(struct sec4_sg_entry);



	/* allocate space for base edesc and hw desc commands, link tables */

	edesc = kmalloc(sizeof(*edesc) + desc_bytes +

			sec4_sg_bytes, GFP_DMA | flags);

	edesc = kzalloc(sizeof(*edesc) + desc_bytes + sec4_sg_bytes,

			GFP_DMA | flags);

	if (!edesc) {

		dev_err(jrdev, "could not allocate extended descriptor\n");

		return ERR_PTR(-ENOMEM);

drivers/crypto/caam/caamhash.c

+12 −13
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ static int ahash_update_ctx(struct ahash_request *req) 
		 * allocate space for base edesc and hw desc commands,

		 * link tables

		 */

		edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN +

		edesc = kzalloc(sizeof(*edesc) + DESC_JOB_IO_LEN +

				sec4_sg_bytes, GFP_DMA | flags);

		if (!edesc) {

			dev_err(jrdev,
@@ -918,8 +918,8 @@ static int ahash_final_ctx(struct ahash_request *req) 
	sec4_sg_bytes = (1 + (buflen ? 1 : 0)) * sizeof(struct sec4_sg_entry);



	/* allocate space for base edesc and hw desc commands, link tables */

	edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN +

			sec4_sg_bytes, GFP_DMA | flags);

	edesc = kzalloc(sizeof(*edesc) + DESC_JOB_IO_LEN + sec4_sg_bytes,

			GFP_DMA | flags);

	if (!edesc) {

		dev_err(jrdev, "could not allocate extended descriptor\n");

		return -ENOMEM;
@@ -1005,8 +1005,8 @@ static int ahash_finup_ctx(struct ahash_request *req) 
			 sizeof(struct sec4_sg_entry);



	/* allocate space for base edesc and hw desc commands, link tables */

	edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN +

			sec4_sg_bytes, GFP_DMA | flags);

	edesc = kzalloc(sizeof(*edesc) + DESC_JOB_IO_LEN + sec4_sg_bytes,

			GFP_DMA | flags);

	if (!edesc) {

		dev_err(jrdev, "could not allocate extended descriptor\n");

		return -ENOMEM;
@@ -1091,8 +1091,8 @@ static int ahash_digest(struct ahash_request *req) 
	sec4_sg_bytes = src_nents * sizeof(struct sec4_sg_entry);



	/* allocate space for base edesc and hw desc commands, link tables */

	edesc = kmalloc(sizeof(struct ahash_edesc) + sec4_sg_bytes +

			DESC_JOB_IO_LEN, GFP_DMA | flags);

	edesc = kzalloc(sizeof(*edesc) + sec4_sg_bytes + DESC_JOB_IO_LEN,

			GFP_DMA | flags);

	if (!edesc) {

		dev_err(jrdev, "could not allocate extended descriptor\n");

		return -ENOMEM;
@@ -1165,8 +1165,7 @@ static int ahash_final_no_ctx(struct ahash_request *req) 
	int sh_len;



	/* allocate space for base edesc and hw desc commands, link tables */

	edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN,

			GFP_DMA | flags);

	edesc = kzalloc(sizeof(*edesc) + DESC_JOB_IO_LEN, GFP_DMA | flags);

	if (!edesc) {

		dev_err(jrdev, "could not allocate extended descriptor\n");

		return -ENOMEM;
@@ -1245,7 +1244,7 @@ static int ahash_update_no_ctx(struct ahash_request *req) 
		 * allocate space for base edesc and hw desc commands,

		 * link tables

		 */

		edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN +

		edesc = kzalloc(sizeof(*edesc) + DESC_JOB_IO_LEN +

				sec4_sg_bytes, GFP_DMA | flags);

		if (!edesc) {

			dev_err(jrdev,
@@ -1353,8 +1352,8 @@ static int ahash_finup_no_ctx(struct ahash_request *req) 
			 sizeof(struct sec4_sg_entry);



	/* allocate space for base edesc and hw desc commands, link tables */

	edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN +

			sec4_sg_bytes, GFP_DMA | flags);

	edesc = kzalloc(sizeof(*edesc) + DESC_JOB_IO_LEN + sec4_sg_bytes,

			GFP_DMA | flags);

	if (!edesc) {

		dev_err(jrdev, "could not allocate extended descriptor\n");

		return -ENOMEM;
@@ -1448,7 +1447,7 @@ static int ahash_update_first(struct ahash_request *req) 
		 * allocate space for base edesc and hw desc commands,

		 * link tables

		 */

		edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN +

		edesc = kzalloc(sizeof(*edesc) + DESC_JOB_IO_LEN +

				sec4_sg_bytes, GFP_DMA | flags);

		if (!edesc) {

			dev_err(jrdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE