linux-kernel - [PATCH] scsi: lpfc: lpfc_init: use kcalloc for allocating memory

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-next>] [day] [month] [year] [list]

Message-Id: <1396988297-29240-1-git-send-email-eu@opreamatei.ro>
Date:	Tue,  8 Apr 2014 23:18:17 +0300
From:	Matei Oprea <eu@...eamatei.ro>
To:	jbottomley@...allels.com
Cc:	linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
	Matei Oprea <eu@...eamatei.ro>,
	ROSEdu Kernel Community <firefly@...ts.rosedu.org>
Subject: [PATCH] scsi: lpfc: lpfc_init: use kcalloc for allocating memory

It's easier to use kcalloc for allocating arrays. While at it
also remove useless casting value.

Signed-off-by: Matei Oprea <eu@...eamatei.ro>
Cc: ROSEdu Kernel Community <firefly@...ts.rosedu.org>
---
 drivers/scsi/lpfc/lpfc_init.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index e286909..2b1a786 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -4742,12 +4742,14 @@ lpfc_sli_driver_resource_setup(struct lpfc_hba *phba)
 			phba->cfg_sg_seg_cnt = LPFC_DEFAULT_MENLO_SG_SEG_CNT;
 	}
 
-	if (!phba->sli.ring) {
+	if (unlikely(!phba->sli.ring)) {
 		phba->sli.ring = kcalloc(LPFC_SLI3_MAX_RING,
 				sizeof(struct lpfc_sli_ring),
 				GFP_KERNEL);
-		return -ENOMEM;
 	}
+
+	if (!phba->sli.ring)
+		return -ENOMEM;
 
 	/*
 	 * Since lpfc_sg_seg_cnt is module parameter, the sg_dma_buf_size
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/