* [PATCH v2] scsi: csiostor: Use kcalloc() instead of kzalloc()
@ 2024-01-14 10:24 Erick Archer
2024-01-15 18:26 ` Gustavo A. R. Silva
0 siblings, 1 reply; 2+ messages in thread
From: Erick Archer @ 2024-01-14 10:24 UTC (permalink / raw)
To: James E.J. Bottomley, Martin K. Petersen, Gustavo A. R. Silva
Cc: Erick Archer, Kees Cook, Bjorn Helgaas, Justin Stitt, linux-scsi,
linux-kernel, linux-hardening
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2] scsi: csiostor: Use kcalloc() instead of kzalloc()
2024-01-14 10:24 [PATCH v2] scsi: csiostor: Use kcalloc() instead of kzalloc() Erick Archer
@ 2024-01-15 18:26 ` Gustavo A. R. Silva
0 siblings, 0 replies; 2+ messages in thread
From: Gustavo A. R. Silva @ 2024-01-15 18:26 UTC (permalink / raw)
To: Erick Archer, James E.J. Bottomley, Martin K. Petersen,
Gustavo A. R. Silva
Cc: Kees Cook, Bjorn Helgaas, Justin Stitt, linux-scsi, linux-kernel,
linux-hardening
On 1/14/24 04:24, Erick Archer wrote:
> 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>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks!
--
Gustavo
> ---
> 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
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-15 18:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-14 10:24 [PATCH v2] scsi: csiostor: Use kcalloc() instead of kzalloc() Erick Archer
2024-01-15 18:26 ` Gustavo A. R. Silva
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).