linux-kernel - Re: [PATCH v2] scsi: be2iscsi: Use kasprintf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 11 Oct 2017 14:02:19 -0400
From:   Kyle Fortin <kyle.fortin@...cle.com>
To:     Himanshu Jha <himanshujha199640@...il.com>
Cc:     jejb@...ux.vnet.ibm.com, martin.petersen@...cle.com,
        linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
        subbu.seetharaman@...adcom.com, ketan.mukadam@...adcom.com,
        jitendra.bhivare@...adcom.com
Subject: Re: [PATCH v2] scsi: be2iscsi: Use kasprintf

On Oct 11, 2017, at 11:36 AM, Himanshu Jha <himanshujha199640@...il.com> wrote:
> 
> Use kasprintf instead of combination of kmalloc and sprintf.
> Also, remove BEISCSI_MSI_NAME macro used to specify size of string as
> kasprintf handles size computations.
> 
> Signed-off-by: Himanshu Jha <himanshujha199640@...il.com>
> ---
> v2:
>   -remove the unnecessary macro BEISCSI_MSI_NAME. 
> 
> drivers/scsi/be2iscsi/be_main.c | 12 +++++-------
> drivers/scsi/be2iscsi/be_main.h |  2 --
> 2 files changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
> index b4542e7..6a9ee0e 100644
> --- a/drivers/scsi/be2iscsi/be_main.c
> +++ b/drivers/scsi/be2iscsi/be_main.c
> @@ -803,15 +803,14 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba)
> 
> 	if (pcidev->msix_enabled) {
> 		for (i = 0; i < phba->num_cpus; i++) {
> -			phba->msi_name[i] = kzalloc(BEISCSI_MSI_NAME,
> -						    GFP_KERNEL);
> +			phba->msi_name[i] = kasprintf(GFP_KERNEL,
> +						      "beiscsi_%02x_%02x",
> +						      phba->shost->host_no, i);
> 			if (!phba->msi_name[i]) {
> 				ret = -ENOMEM;
> 				goto free_msix_irqs;
> 			}
> 
> -			sprintf(phba->msi_name[i], "beiscsi_%02x_%02x",
> -				phba->shost->host_no, i);
> 			ret = request_irq(pci_irq_vector(pcidev, i),
> 					  be_isr_msix, 0, phba->msi_name[i],
> 					  &phwi_context->be_eq[i]);
> @@ -824,13 +823,12 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba)
> 				goto free_msix_irqs;
> 			}
> 		}
> -		phba->msi_name[i] = kzalloc(BEISCSI_MSI_NAME, GFP_KERNEL);
> +		phba->msi_name[i] = kasprintf(GFP_KERNEL, "beiscsi_mcc_%02x",
> +					      phba->shost->host_no);
> 		if (!phba->msi_name[i]) {
> 			ret = -ENOMEM;
> 			goto free_msix_irqs;
> 		}
> -		sprintf(phba->msi_name[i], "beiscsi_mcc_%02x",
> -			phba->shost->host_no);
> 		ret = request_irq(pci_irq_vector(pcidev, i), be_isr_mcc, 0,
> 				  phba->msi_name[i], &phwi_context->be_eq[i]);
> 		if (ret) {
> diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
> index 81ce3ff..8166de5 100644
> --- a/drivers/scsi/be2iscsi/be_main.h
> +++ b/drivers/scsi/be2iscsi/be_main.h
> @@ -155,8 +155,6 @@
> #define PAGES_REQUIRED(x) \
> 	((x < PAGE_SIZE) ? 1 :  ((x + PAGE_SIZE - 1) / PAGE_SIZE))
> 
> -#define BEISCSI_MSI_NAME 20 /* size of msi_name string */
> -
> #define MEM_DESCR_OFFSET 8
> #define BEISCSI_DEFQ_HDR 1
> #define BEISCSI_DEFQ_DATA 0
> -- 
> 2.7.4
> 

Looks good.

Reviewed-by: Kyle Fortin <kyle.fortin@...cle.com>