On Sat, Mar 30, 2024 at 05:17:53PM +0100, 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 > Reviewed-by: Gustavo A. R. Silva <gustavoars@xxxxxxxxxx> > Signed-off-by: Erick Archer <erick.archer@xxxxxxxxxxx> > --- > Changes in v2: > - Update the changelog text describing the sizeof() > changes (Gustavo A. R. Silva) > > Changes in v3: > - Add the "Reviewed-by:" tag. > - Rebase against linux-next. > > Version 1: > Link: https://lore.kernel.org/linux-hardening/20240112182603.11048-1-erick.archer@xxxxxxx/ > > Version 2: > Link: https://lore.kernel.org/linux-hardening/20240114102400.3816-1-erick.archer@xxxxxxx/ > > Hi everyone, > > This patch seems to be lost. Gustavo reviewed it on January 15, 2024 > but the patch has not been applied since. This looks correct to me. I can pick this up if no one else snags it? Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> -Kees > > Thanks, > Erick > --- > 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 > -- Kees Cook
