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

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: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Thorsten Blum and committed by
Herbert Xu 4f95a6d2 0926d8ee

+12 -12
+12 -12
drivers/crypto/bcm/cipher.c
··· 141 141 struct iproc_ctx_s *ctx = rctx->ctx; 142 142 u32 datalen; /* Number of bytes of response data expected */ 143 143 144 - mssg->spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist), 145 - rctx->gfp); 144 + mssg->spu.dst = kmalloc_array(rx_frag_num, sizeof(struct scatterlist), 145 + rctx->gfp); 146 146 if (!mssg->spu.dst) 147 147 return -ENOMEM; 148 148 ··· 205 205 u32 datalen; /* Number of bytes of response data expected */ 206 206 u32 stat_len; 207 207 208 - mssg->spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist), 209 - rctx->gfp); 208 + mssg->spu.src = kmalloc_array(tx_frag_num, sizeof(struct scatterlist), 209 + rctx->gfp); 210 210 if (unlikely(!mssg->spu.src)) 211 211 return -ENOMEM; 212 212 ··· 532 532 struct scatterlist *sg; /* used to build sgs in mbox message */ 533 533 struct iproc_ctx_s *ctx = rctx->ctx; 534 534 535 - mssg->spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist), 536 - rctx->gfp); 535 + mssg->spu.dst = kmalloc_array(rx_frag_num, sizeof(struct scatterlist), 536 + rctx->gfp); 537 537 if (!mssg->spu.dst) 538 538 return -ENOMEM; 539 539 ··· 587 587 u32 datalen; /* Number of bytes of response data expected */ 588 588 u32 stat_len; 589 589 590 - mssg->spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist), 591 - rctx->gfp); 590 + mssg->spu.src = kmalloc_array(tx_frag_num, sizeof(struct scatterlist), 591 + rctx->gfp); 592 592 if (!mssg->spu.src) 593 593 return -ENOMEM; 594 594 ··· 1077 1077 /* have to catch gcm pad in separate buffer */ 1078 1078 rx_frag_num++; 1079 1079 1080 - mssg->spu.dst = kcalloc(rx_frag_num, sizeof(struct scatterlist), 1081 - rctx->gfp); 1080 + mssg->spu.dst = kmalloc_array(rx_frag_num, sizeof(struct scatterlist), 1081 + rctx->gfp); 1082 1082 if (!mssg->spu.dst) 1083 1083 return -ENOMEM; 1084 1084 ··· 1179 1179 u32 assoc_offset = 0; 1180 1180 u32 stat_len; 1181 1181 1182 - mssg->spu.src = kcalloc(tx_frag_num, sizeof(struct scatterlist), 1183 - rctx->gfp); 1182 + mssg->spu.src = kmalloc_array(tx_frag_num, sizeof(struct scatterlist), 1183 + rctx->gfp); 1184 1184 if (!mssg->spu.src) 1185 1185 return -ENOMEM; 1186 1186