From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> Date: Thu, 18 Aug 2016 11:26:18 +0200 * The script "checkpatch.pl" can point information out like the following. WARNING: Prefer kcalloc over kzalloc with multiply Thus fix the affected source code places. * Replace the specification of data structures by pointer dereferences to make the corresponding size determination a bit safer according to the Linux coding style convention. Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index b08bfb7..3502a3a 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1604,12 +1604,12 @@ static int cciss_bigpassthru(ctlr_info_t *h, void __user *argp) status = -EINVAL; goto free_ioc; } - buff_size = kmalloc(MAXSGENTRIES * sizeof(int), GFP_KERNEL); + buff_size = kcalloc(MAXSGENTRIES, sizeof(*buff_size), GFP_KERNEL); if (!buff_size) { status = -ENOMEM; goto free_ioc; } - buff = kzalloc(MAXSGENTRIES * sizeof(char *), GFP_KERNEL); + buff = kcalloc(MAXSGENTRIES, sizeof(*buff), GFP_KERNEL); if (!buff) { status = -ENOMEM; goto free_size; @@ -4838,8 +4838,9 @@ static int cciss_allocate_scatterlists(ctlr_info_t *h) int i; /* zero it, so that on free we need not know how many were alloc'ed */ - h->scatter_list = kzalloc(h->max_commands * - sizeof(struct scatterlist *), GFP_KERNEL); + h->scatter_list = kcalloc(h->max_commands, + sizeof(*h->scatter_list), + GFP_KERNEL); if (!h->scatter_list) return -ENOMEM; -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html