From: Erick Archer <erick.archer@gmx.com>
To: "James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Erick Archer <erick.archer@gmx.com>,
Kees Cook <keescook@chromium.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Justin Stitt <justinstitt@google.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: [PATCH v2] scsi: csiostor: Use kcalloc() instead of kzalloc()
Date: Sun, 14 Jan 2024 11:24:00 +0100 [thread overview]
Message-ID: <20240114102400.3816-1-erick.archer@gmx.com> (raw)
Use 2-factor multiplication argument form kcalloc() instead
of kzalloc().
Also, it is preferred to use sizeof(*pointer) instead of
sizeof(type) due to the type of the variable can change and
one needs not change the former (unlike the latter).
Link: https://github.com/KSPP/linux/issues/162
Signed-off-by: Erick Archer <erick.archer@gmx.com>
---
Changes in v2:
- Update the changelog text describing the sizeof()
changes (Gustavo A. R. Silva)
Version 1:
Link: https://lore.kernel.org/linux-hardening/20240112182603.11048-1-erick.archer@gmx.com/
---
drivers/scsi/csiostor/csio_init.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index d649b7a2a879..d72892e44fd1 100644
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -698,8 +698,7 @@ csio_lnodes_block_request(struct csio_hw *hw)
struct csio_lnode **lnode_list;
int cur_cnt = 0, ii;
- lnode_list = kzalloc((sizeof(struct csio_lnode *) * hw->num_lns),
- GFP_KERNEL);
+ lnode_list = kcalloc(hw->num_lns, sizeof(*lnode_list), GFP_KERNEL);
if (!lnode_list) {
csio_err(hw, "Failed to allocate lnodes_list");
return;
@@ -737,8 +736,7 @@ csio_lnodes_unblock_request(struct csio_hw *hw)
struct csio_lnode **lnode_list;
int cur_cnt = 0, ii;
- lnode_list = kzalloc((sizeof(struct csio_lnode *) * hw->num_lns),
- GFP_KERNEL);
+ lnode_list = kcalloc(hw->num_lns, sizeof(*lnode_list), GFP_KERNEL);
if (!lnode_list) {
csio_err(hw, "Failed to allocate lnodes_list");
return;
@@ -775,8 +773,7 @@ csio_lnodes_block_by_port(struct csio_hw *hw, uint8_t portid)
struct csio_lnode **lnode_list;
int cur_cnt = 0, ii;
- lnode_list = kzalloc((sizeof(struct csio_lnode *) * hw->num_lns),
- GFP_KERNEL);
+ lnode_list = kcalloc(hw->num_lns, sizeof(*lnode_list), GFP_KERNEL);
if (!lnode_list) {
csio_err(hw, "Failed to allocate lnodes_list");
return;
@@ -816,8 +813,7 @@ csio_lnodes_unblock_by_port(struct csio_hw *hw, uint8_t portid)
struct csio_lnode **lnode_list;
int cur_cnt = 0, ii;
- lnode_list = kzalloc((sizeof(struct csio_lnode *) * hw->num_lns),
- GFP_KERNEL);
+ lnode_list = kcalloc(hw->num_lns, sizeof(*lnode_list), GFP_KERNEL);
if (!lnode_list) {
csio_err(hw, "Failed to allocate lnodes_list");
return;
@@ -855,8 +851,7 @@ csio_lnodes_exit(struct csio_hw *hw, bool npiv)
struct csio_lnode **lnode_list;
int cur_cnt = 0, ii;
- lnode_list = kzalloc((sizeof(struct csio_lnode *) * hw->num_lns),
- GFP_KERNEL);
+ lnode_list = kcalloc(hw->num_lns, sizeof(*lnode_list), GFP_KERNEL);
if (!lnode_list) {
csio_err(hw, "lnodes_exit: Failed to allocate lnodes_list.\n");
return;
--
2.25.1
next reply other threads:[~2024-01-14 10:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-14 10:24 Erick Archer [this message]
2024-01-15 18:26 ` [PATCH v2] scsi: csiostor: Use kcalloc() instead of kzalloc() Gustavo A. R. Silva
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=20240114102400.3816-1-erick.archer@gmx.com \
--to=erick.archer@gmx.com \
--cc=bhelgaas@google.com \
--cc=gustavoars@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=justinstitt@google.com \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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;
as well as URLs for NNTP newsgroup(s).