From: Jiasheng Jiang <jiashengjiangcool@gmail.com>
To: bvanassche@acm.org
Cc: GR-QLogic-Storage-Upstream@marvell.com,
James.Bottomley@HansenPartnership.com, arun.easi@cavium.com,
jhasan@marvell.com, jiashengjiangcool@gmail.com,
linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org,
manish.rangankar@cavium.com, martin.petersen@oracle.com,
nilesh.javali@cavium.com, skashyap@marvell.com
Subject: [PATCH v2] scsi: qedf: Use kcalloc() and add check for bdt_info
Date: Fri, 31 Jan 2025 21:35:16 +0000 [thread overview]
Message-ID: <20250131213516.7750-1-jiashengjiangcool@gmail.com> (raw)
In-Reply-To: <bbb46821-25dc-4f5d-a6bf-cbef34024afd@acm.org>
Replace kmalloc_array() with kcalloc() to avoid old (dirty) data being
used/freed.
Moreover, add a check for "bdt_info". Otherwise, if one of the allocations
for cmgr->io_bdt_pool[i] fails, "bdt_info->bd_tbl" will cause a NULL
pointer dereference.
Fixes: 61d8658b4a43 ("scsi: qedf: Add QLogic FastLinQ offload FCoE driver framework.")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
Changelog:
v1 -> v2:
1. Replace kzalloc() with kcalloc().
---
drivers/scsi/qedf/qedf_io.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c
index fcfc3bed02c6..abb459e87a86 100644
--- a/drivers/scsi/qedf/qedf_io.c
+++ b/drivers/scsi/qedf/qedf_io.c
@@ -125,7 +125,7 @@ void qedf_cmd_mgr_free(struct qedf_cmd_mgr *cmgr)
bd_tbl_sz = QEDF_MAX_BDS_PER_CMD * sizeof(struct scsi_sge);
for (i = 0; i < num_ios; i++) {
bdt_info = cmgr->io_bdt_pool[i];
- if (bdt_info->bd_tbl) {
+ if (bdt_info && bdt_info->bd_tbl) {
dma_free_coherent(&qedf->pdev->dev, bd_tbl_sz,
bdt_info->bd_tbl, bdt_info->bd_tbl_dma);
bdt_info->bd_tbl = NULL;
@@ -254,9 +254,7 @@ struct qedf_cmd_mgr *qedf_cmd_mgr_alloc(struct qedf_ctx *qedf)
}
/* Allocate pool of io_bdts - one for each qedf_ioreq */
- cmgr->io_bdt_pool = kmalloc_array(num_ios, sizeof(struct io_bdt *),
- GFP_KERNEL);
-
+ cmgr->io_bdt_pool = kcalloc(num_ios, sizeof(struct io_bdt *), GFP_KERNEL);
if (!cmgr->io_bdt_pool) {
QEDF_WARN(&(qedf->dbg_ctx), "Failed to alloc io_bdt_pool.\n");
goto mem_err;
--
2.25.1
next prev parent reply other threads:[~2025-01-31 21:35 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-31 19:54 [PATCH] scsi: qedf: Use kzalloc() and add check for bdt_info Jiasheng Jiang
2025-01-31 20:32 ` Bart Van Assche
2025-01-31 21:35 ` Jiasheng Jiang [this message]
2025-02-02 15:22 ` [PATCH v2] scsi: qedf: Use kcalloc() " Markus Elfring
2025-02-02 16:54 ` Markus Elfring
2025-02-02 21:21 ` [PATCH] Replace kmalloc_array() with kcalloc() Jiasheng Jiang
2025-02-02 21:29 ` [PATCH] scsi: qedf: Add check for bdt_info Jiasheng Jiang
2025-02-02 21:32 ` [PATCH] scsi: qedf: Replace kmalloc_array() with kcalloc() Jiasheng Jiang
2025-02-03 7:20 ` [PATCH v3?] " Markus Elfring
2025-02-04 2:51 ` [PATCH v3] " Jiasheng Jiang
2025-02-04 2:52 ` [PATCH v3?] " Jiasheng Jiang
2025-02-04 8:05 ` [v3?] " Markus Elfring
2025-02-05 1:07 ` [PATCH v3 1/2] " Jiasheng Jiang
2025-02-05 1:07 ` [PATCH v3 2/2] scsi: qedf: Add check for bdt_info Jiasheng Jiang
2025-02-05 1:08 ` [v3?] scsi: qedf: Replace kmalloc_array() with kcalloc() Jiasheng Jiang
2025-02-05 8:11 ` Markus Elfring
2025-02-06 5:12 ` Jiasheng Jiang
2025-02-06 12:16 ` Markus Elfring
2025-02-06 5:25 ` [PATCH 0/2] scsi: qedf: Replace alloction API and add null check Jiasheng Jiang
2025-02-06 5:25 ` [PATCH 1/2] scsi: qedf: Replace kmalloc_array() with kcalloc() Jiasheng Jiang
2025-02-06 5:36 ` Greg KH
2025-02-06 5:38 ` Greg KH
2025-02-06 19:19 ` [PATCH v2 " Jiasheng Jiang
2025-02-06 19:20 ` [PATCH v2 2/2] scsi: qedf: Add check for bdt_info Jiasheng Jiang
2025-02-07 15:09 ` [PATCH v2 1/2] scsi: qedf: Replace kmalloc_array() with kcalloc() Greg KH
2025-02-07 15:45 ` [PATCH v3 " Jiasheng Jiang
2025-02-07 15:45 ` [PATCH v3 2/2] scsi: qedf: Add check for bdt_info Jiasheng Jiang
2025-02-07 15:46 ` [PATCH v2 1/2] scsi: qedf: Replace kmalloc_array() with kcalloc() Jiasheng Jiang
2025-02-06 5:25 ` [PATCH 2/2] scsi: qedf: Add check for bdt_info Jiasheng Jiang
2025-02-06 11:56 ` [PATCH v5? 0/2] scsi: qedf: Replace alloction API and add null check Markus Elfring
2025-02-05 2:01 ` [PATCH RESEND v3 1/2] scsi: qedf: Replace kmalloc_array() with kcalloc() Jiasheng Jiang
2025-02-05 2:01 ` [PATCH RESEND v3 2/2] scsi: qedf: Add check for bdt_info Jiasheng Jiang
2025-02-02 21:33 ` [PATCH v2] scsi: qedf: Use kcalloc() and add " Jiasheng Jiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250131213516.7750-1-jiashengjiangcool@gmail.com \
--to=jiashengjiangcool@gmail.com \
--cc=GR-QLogic-Storage-Upstream@marvell.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=arun.easi@cavium.com \
--cc=bvanassche@acm.org \
--cc=jhasan@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=manish.rangankar@cavium.com \
--cc=martin.petersen@oracle.com \
--cc=nilesh.javali@cavium.com \
--cc=skashyap@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox