Re: [PATCH 06/46] selinux: Use kcalloc() in policydb_index()

Paul Moore
2017-03-23T21:15:12Z

On Sun, Jan 15, 2017 at 10:03 AM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sat, 14 Jan 2017 13:08:59 +0100
>
> Multiplications for the size determination of memory allocations
> indicated that array data structures should be processed.
> Thus use the corresponding function "kcalloc".
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> security/selinux/ss/policydb.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)

Merged, thanks.

> diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
> index d719db4219cd..21869b622c0c 100644
> --- a/security/selinux/ss/policydb.c
> +++ b/security/selinux/ss/policydb.c
> @@ -540,23 +540,23 @@ static int policydb_index(struct policydb *p)
> #endif
>
> rc = -ENOMEM;
> - p->class_val_to_struct =
> - kzalloc(p->p_classes.nprim * sizeof(*(p->class_val_to_struct)),
> - GFP_KERNEL);
> + p->class_val_to_struct = kcalloc(p->p_classes.nprim,
> + sizeof(*p->class_val_to_struct),
> + GFP_KERNEL);
> if (!p->class_val_to_struct)
> goto out;
>
> rc = -ENOMEM;
> - p->role_val_to_struct =
> - kzalloc(p->p_roles.nprim * sizeof(*(p->role_val_to_struct)),
> - GFP_KERNEL);
> + p->role_val_to_struct = kcalloc(p->p_roles.nprim,
> + sizeof(*p->role_val_to_struct),
> + GFP_KERNEL);
> if (!p->role_val_to_struct)
> goto out;
>
> rc = -ENOMEM;
> - p->user_val_to_struct =
> - kzalloc(p->p_users.nprim * sizeof(*(p->user_val_to_struct)),
> - GFP_KERNEL);
> + p->user_val_to_struct = kcalloc(p->p_users.nprim,
> + sizeof(*p->user_val_to_struct),
> + GFP_KERNEL);
> if (!p->user_val_to_struct)
> goto out;
>
> --
> 2.11.0
>

--
paul moore