Re: [PATCH] pds_core: Allocate pdsc_viftype_defaults copy with ARRAY_SIZE()

["Nelson, Shannon" <shannon.nelson@amd.com>]

On 4/25/2025 11:07 PM, Kees Cook wrote:
> 
> In preparation for making the kmalloc family of allocators type aware,
> we need to make sure that the returned type from the allocation matches
> the type of the variable being assigned. (Before, the allocator would
> always return "void *", which can be implicitly cast to any pointer type.)
> 
> This is allocating a copy of pdsc_viftype_defaults, which is an array of
> struct pdsc_viftype. To correctly return "struct pdsc_viftype *" in the
> future, adjust the allocation to allocating ARRAY_SIZE-many entries. The
> resulting allocation size is the same.
> 
> Signed-off-by: Kees Cook <kees@kernel.org>

Thanks,
sln

Reviewed-by: Shannon Nelson <shannon.nelson@amd.com>

> ---
> Cc: Shannon Nelson <shannon.nelson@amd.com>
> Cc: Brett Creeley <brett.creeley@amd.com>
> Cc: Andrew Lunn <andrew+netdev@lunn.ch>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: <netdev@vger.kernel.org>
> ---
>   drivers/net/ethernet/amd/pds_core/core.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c
> index 1eb0d92786f7..451b005d48d0 100644
> --- a/drivers/net/ethernet/amd/pds_core/core.c
> +++ b/drivers/net/ethernet/amd/pds_core/core.c
> @@ -415,7 +415,8 @@ static int pdsc_viftypes_init(struct pdsc *pdsc)
>   {
>          enum pds_core_vif_types vt;
> 
> -       pdsc->viftype_status = kzalloc(sizeof(pdsc_viftype_defaults),
> +       pdsc->viftype_status = kcalloc(ARRAY_SIZE(pdsc_viftype_defaults),
> +                                      sizeof(*pdsc->viftype_status),
>                                         GFP_KERNEL);
>          if (!pdsc->viftype_status)
>                  return -ENOMEM;
> --
> 2.34.1
>