From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965004AbdCWVPM (ORCPT ); Thu, 23 Mar 2017 17:15:12 -0400 Received: from mail-vk0-f68.google.com ([209.85.213.68]:36655 "EHLO mail-vk0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753023AbdCWVPI (ORCPT ); Thu, 23 Mar 2017 17:15:08 -0400 MIME-Version: 1.0 X-Originating-IP: [108.49.102.27] In-Reply-To: <2c5e5708-72a3-954f-a773-e5716df174d1@users.sourceforge.net> References: <2c5e5708-72a3-954f-a773-e5716df174d1@users.sourceforge.net> From: Paul Moore Date: Thu, 23 Mar 2017 17:15:06 -0400 Message-ID: Subject: Re: [PATCH 06/46] selinux: Use kcalloc() in policydb_index() To: SF Markus Elfring Cc: linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, Eric Paris , James Morris , "Serge E. Hallyn" , Stephen Smalley , William Roberts , LKML , kernel-janitors@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jan 15, 2017 at 10:03 AM, SF Markus Elfring wrote: > From: Markus Elfring > 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 > --- > 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 www.paul-moore.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Moore Date: Thu, 23 Mar 2017 21:15:06 +0000 Subject: Re: [PATCH 06/46] selinux: Use kcalloc() in policydb_index() Message-Id: List-Id: References: <2c5e5708-72a3-954f-a773-e5716df174d1@users.sourceforge.net> In-Reply-To: <2c5e5708-72a3-954f-a773-e5716df174d1@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-security-module@vger.kernel.org On Sun, Jan 15, 2017 at 10:03 AM, SF Markus Elfring wrote: > From: Markus Elfring > 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 > --- > 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 www.paul-moore.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: paul@paul-moore.com (Paul Moore) Date: Thu, 23 Mar 2017 17:15:06 -0400 Subject: [PATCH 06/46] selinux: Use kcalloc() in policydb_index() In-Reply-To: <2c5e5708-72a3-954f-a773-e5716df174d1@users.sourceforge.net> References: <2c5e5708-72a3-954f-a773-e5716df174d1@users.sourceforge.net> Message-ID: To: linux-security-module@vger.kernel.org List-Id: linux-security-module.vger.kernel.org On Sun, Jan 15, 2017 at 10:03 AM, SF Markus Elfring wrote: > From: Markus Elfring > 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 > --- > 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 www.paul-moore.com -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html