[PATCH] scsi: lpfc: fix kzalloc-simple.cocci warnings

[PATCH] scsi: lpfc: fix kzalloc-simple.cocci warnings

[Vasyl Gomonovych]

drivers/scsi/lpfc/lpfc_debugfs.c:5460:22-29: WARNING: kzalloc should be used for phba -> nvmeio_trc, instead of kmalloc/memset
drivers/scsi/lpfc/lpfc_debugfs.c:2230:20-27: WARNING: kzalloc should be used for phba -> nvmeio_trc, instead of kmalloc/memset

 Use kzalloc rather than kmalloc followed by memset with 0

Generated by: scripts/coccinelle/api/alloc/kzalloc-simple.cocci

Signed-off-by: Vasyl Gomonovych <gomonovych@gmail.com>
---
 drivers/scsi/lpfc/lpfc_debugfs.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index d50c481..2bf5ad3 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -2227,7 +2227,7 @@
 	kfree(phba->nvmeio_trc);
 
 	/* Allocate new trace buffer and initialize */
-	phba->nvmeio_trc = kmalloc((sizeof(struct lpfc_debugfs_nvmeio_trc) *
+	phba->nvmeio_trc = kzalloc((sizeof(struct lpfc_debugfs_nvmeio_trc) *
 				    sz), GFP_KERNEL);
 	if (!phba->nvmeio_trc) {
 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
@@ -2235,8 +2235,6 @@
 				"nvmeio_trc buffer\n");
 		return -ENOMEM;
 	}
-	memset(phba->nvmeio_trc, 0,
-	       (sizeof(struct lpfc_debugfs_nvmeio_trc) * sz));
 	atomic_set(&phba->nvmeio_trc_cnt, 0);
 	phba->nvmeio_trc_on = 0;
 	phba->nvmeio_trc_output_idx = 0;
@@ -5457,7 +5455,7 @@ static int lpfc_idiag_cmd_get(const char __user *buf, size_t nbytes,
 			phba->nvmeio_trc_size = lpfc_debugfs_max_nvmeio_trc;
 
 			/* Allocate trace buffer and initialize */
-			phba->nvmeio_trc = kmalloc(
+			phba->nvmeio_trc = kzalloc(
 				(sizeof(struct lpfc_debugfs_nvmeio_trc) *
 				phba->nvmeio_trc_size), GFP_KERNEL);
 
@@ -5467,9 +5465,6 @@ static int lpfc_idiag_cmd_get(const char __user *buf, size_t nbytes,
 						"nvmeio_trc buffer\n");
 				goto nvmeio_off;
 			}
-			memset(phba->nvmeio_trc, 0,
-			       (sizeof(struct lpfc_debugfs_nvmeio_trc) *
-			       phba->nvmeio_trc_size));
 			phba->nvmeio_trc_on = 1;
 			phba->nvmeio_trc_output_idx = 0;
 			phba->nvmeio_trc = NULL;
-- 
1.9.1

Re: [PATCH] scsi: lpfc: fix kzalloc-simple.cocci warnings

[James Smart]

On 10/11/2017 12:42 PM, Vasyl Gomonovych wrote:
> drivers/scsi/lpfc/lpfc_debugfs.c:5460:22-29: WARNING: kzalloc should be used for phba -> nvmeio_trc, instead of kmalloc/memset
> drivers/scsi/lpfc/lpfc_debugfs.c:2230:20-27: WARNING: kzalloc should be used for phba -> nvmeio_trc, instead of kmalloc/memset
>
>   Use kzalloc rather than kmalloc followed by memset with 0
>
> Generated by: scripts/coccinelle/api/alloc/kzalloc-simple.cocci
>
> Signed-off-by: Vasyl Gomonovych <gomonovych@gmail.com>
> ---
>   drivers/scsi/lpfc/lpfc_debugfs.c | 9 ++-------
>   1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
> index d50c481..2bf5ad3 100644
> --- a/drivers/scsi/lpfc/lpfc_debugfs.c
> +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
> @@ -2227,7 +2227,7 @@
>   	kfree(phba->nvmeio_trc);
>   
>   	/* Allocate new trace buffer and initialize */
> -	phba->nvmeio_trc = kmalloc((sizeof(struct lpfc_debugfs_nvmeio_trc) *
> +	phba->nvmeio_trc = kzalloc((sizeof(struct lpfc_debugfs_nvmeio_trc) *
>   				    sz), GFP_KERNEL);
>   	if (!phba->nvmeio_trc) {
>   		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
> @@ -2235,8 +2235,6 @@
>   				"nvmeio_trc buffer\n");
>   		return -ENOMEM;
>   	}
> -	memset(phba->nvmeio_trc, 0,
> -	       (sizeof(struct lpfc_debugfs_nvmeio_trc) * sz));
>   	atomic_set(&phba->nvmeio_trc_cnt, 0);
>   	phba->nvmeio_trc_on = 0;
>   	phba->nvmeio_trc_output_idx = 0;
> @@ -5457,7 +5455,7 @@ static int lpfc_idiag_cmd_get(const char __user *buf, size_t nbytes,
>   			phba->nvmeio_trc_size = lpfc_debugfs_max_nvmeio_trc;
>   
>   			/* Allocate trace buffer and initialize */
> -			phba->nvmeio_trc = kmalloc(
> +			phba->nvmeio_trc = kzalloc(
>   				(sizeof(struct lpfc_debugfs_nvmeio_trc) *
>   				phba->nvmeio_trc_size), GFP_KERNEL);
>   
> @@ -5467,9 +5465,6 @@ static int lpfc_idiag_cmd_get(const char __user *buf, size_t nbytes,
>   						"nvmeio_trc buffer\n");
>   				goto nvmeio_off;
>   			}
> -			memset(phba->nvmeio_trc, 0,
> -			       (sizeof(struct lpfc_debugfs_nvmeio_trc) *
> -			       phba->nvmeio_trc_size));
>   			phba->nvmeio_trc_on = 1;
>   			phba->nvmeio_trc_output_idx = 0;
>   			phba->nvmeio_trc = NULL;

looks good.


Signed-off-by:  James Smart <james.smart@broadcom.com>

Re: [PATCH] scsi: lpfc: fix kzalloc-simple.cocci warnings

[Martin K. Petersen]

Vasyl,

> drivers/scsi/lpfc/lpfc_debugfs.c:5460:22-29: WARNING: kzalloc should be used for phba -> nvmeio_trc, instead of kmalloc/memset
> drivers/scsi/lpfc/lpfc_debugfs.c:2230:20-27: WARNING: kzalloc should be used for phba -> nvmeio_trc, instead of kmalloc/memset
>
>  Use kzalloc rather than kmalloc followed by memset with 0

Applied to 4.15/scsi-queue.

-- 
Martin K. Petersen	Oracle Linux Engineering