Commit 4f95a6d2 authored by Thorsten Blum's avatar Thorsten Blum Committed by Herbert Xu
Browse files

crypto: bcm - set memory to zero only once 



Use kmalloc_array() instead of kcalloc() because sg_init_table() already
sets the memory to zero. This avoids zeroing the memory twice.

Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0926d8ee

drivers/crypto/bcm/cipher.c

+12 −12
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ spu_skcipher_rx_sg_create(struct brcm_message *mssg, 
	struct iproc_ctx_s *ctx = rctx->ctx;

	u32 datalen;		/* Number of bytes of response data expected */



	mssg->spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist),

	mssg->spu.dst = kmalloc_array(rx_frag_num, sizeof(struct scatterlist),

				      rctx->gfp);

	if (!mssg->spu.dst)

		return -ENOMEM;
@@ -205,7 +205,7 @@ spu_skcipher_tx_sg_create(struct brcm_message *mssg, 
	u32 datalen;		/* Number of bytes of response data expected */

	u32 stat_len;



	mssg->spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist),

	mssg->spu.src = kmalloc_array(tx_frag_num, sizeof(struct scatterlist),

				      rctx->gfp);

	if (unlikely(!mssg->spu.src))

		return -ENOMEM;
@@ -532,7 +532,7 @@ spu_ahash_rx_sg_create(struct brcm_message *mssg, 
	struct scatterlist *sg;	/* used to build sgs in mbox message */

	struct iproc_ctx_s *ctx = rctx->ctx;



	mssg->spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist),

	mssg->spu.dst = kmalloc_array(rx_frag_num, sizeof(struct scatterlist),

				      rctx->gfp);

	if (!mssg->spu.dst)

		return -ENOMEM;
@@ -587,7 +587,7 @@ spu_ahash_tx_sg_create(struct brcm_message *mssg, 
	u32 datalen;		/* Number of bytes of response data expected */

	u32 stat_len;



	mssg->spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist),

	mssg->spu.src = kmalloc_array(tx_frag_num, sizeof(struct scatterlist),

				      rctx->gfp);

	if (!mssg->spu.src)

		return -ENOMEM;
@@ -1077,7 +1077,7 @@ static int spu_aead_rx_sg_create(struct brcm_message *mssg, 
		/* have to catch gcm pad in separate buffer */

		rx_frag_num++;



	mssg->spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist),

	mssg->spu.dst = kmalloc_array(rx_frag_num, sizeof(struct scatterlist),

				      rctx->gfp);

	if (!mssg->spu.dst)

		return -ENOMEM;
@@ -1179,7 +1179,7 @@ static int spu_aead_tx_sg_create(struct brcm_message *mssg, 
	u32 assoc_offset = 0;

	u32 stat_len;



	mssg->spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist),

	mssg->spu.src = kmalloc_array(tx_frag_num, sizeof(struct scatterlist),

				      rctx->gfp);

	if (!mssg->spu.src)

		return -ENOMEM;