From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752017AbdEPS2f (ORCPT ); Tue, 16 May 2017 14:28:35 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:36524 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751767AbdEPS2b (ORCPT ); Tue, 16 May 2017 14:28:31 -0400 MIME-Version: 1.0 X-Originating-IP: [108.49.102.27] In-Reply-To: <8a517289-e5a7-8dde-0f5f-9e57f3e270c7@users.sourceforge.net> References: <5704e656-708a-b611-5611-70fc65dc67e8@users.sourceforge.net> <8a517289-e5a7-8dde-0f5f-9e57f3e270c7@users.sourceforge.net> From: Paul Moore Date: Tue, 16 May 2017 14:28:28 -0400 Message-ID: Subject: Re: [PATCH 1/3] selinux: Return directly after a failed memory allocation in policydb_index() To: SF Markus Elfring Cc: Casey Schaufler , Eric Paris , James Morris , "Serge E. Hallyn" , Stephen Smalley , William Roberts , linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, 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 Tue, Apr 4, 2017 at 7:12 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Tue, 4 Apr 2017 10:20:46 +0200 > > Replace five goto statements (and previous variable assignments) by > direct returns after a memory allocation failure in this function. > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) Merged. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index 0080122760ad..87d645d3a39f 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -538,34 +538,30 @@ static int policydb_index(struct policydb *p) > symtab_hash_eval(p->symtab); > #endif > > - rc = -ENOMEM; > 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; > + return -ENOMEM; > > - rc = -ENOMEM; > 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; > + return -ENOMEM; > > - rc = -ENOMEM; > 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; > + return -ENOMEM; > > /* Yes, I want the sizeof the pointer, not the structure */ > - rc = -ENOMEM; > p->type_val_to_struct_array = flex_array_alloc(sizeof(struct type_datum *), > p->p_types.nprim, > GFP_KERNEL | __GFP_ZERO); > if (!p->type_val_to_struct_array) > - goto out; > + return -ENOMEM; > > rc = flex_array_prealloc(p->type_val_to_struct_array, 0, > p->p_types.nprim, GFP_KERNEL | __GFP_ZERO); > @@ -577,12 +573,11 @@ static int policydb_index(struct policydb *p) > goto out; > > for (i = 0; i < SYM_NUM; i++) { > - rc = -ENOMEM; > p->sym_val_to_name[i] = flex_array_alloc(sizeof(char *), > p->symtab[i].nprim, > GFP_KERNEL | __GFP_ZERO); > if (!p->sym_val_to_name[i]) > - goto out; > + return -ENOMEM; > > rc = flex_array_prealloc(p->sym_val_to_name[i], > 0, p->symtab[i].nprim, > -- > 2.12.2 > -- paul moore www.paul-moore.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Moore Date: Tue, 16 May 2017 18:28:28 +0000 Subject: Re: [PATCH 1/3] selinux: Return directly after a failed memory allocation in policydb_index() Message-Id: List-Id: References: <5704e656-708a-b611-5611-70fc65dc67e8@users.sourceforge.net> <8a517289-e5a7-8dde-0f5f-9e57f3e270c7@users.sourceforge.net> In-Reply-To: <8a517289-e5a7-8dde-0f5f-9e57f3e270c7@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 Tue, Apr 4, 2017 at 7:12 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Tue, 4 Apr 2017 10:20:46 +0200 > > Replace five goto statements (and previous variable assignments) by > direct returns after a memory allocation failure in this function. > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) Merged. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index 0080122760ad..87d645d3a39f 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -538,34 +538,30 @@ static int policydb_index(struct policydb *p) > symtab_hash_eval(p->symtab); > #endif > > - rc = -ENOMEM; > 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; > + return -ENOMEM; > > - rc = -ENOMEM; > 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; > + return -ENOMEM; > > - rc = -ENOMEM; > 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; > + return -ENOMEM; > > /* Yes, I want the sizeof the pointer, not the structure */ > - rc = -ENOMEM; > p->type_val_to_struct_array = flex_array_alloc(sizeof(struct type_datum *), > p->p_types.nprim, > GFP_KERNEL | __GFP_ZERO); > if (!p->type_val_to_struct_array) > - goto out; > + return -ENOMEM; > > rc = flex_array_prealloc(p->type_val_to_struct_array, 0, > p->p_types.nprim, GFP_KERNEL | __GFP_ZERO); > @@ -577,12 +573,11 @@ static int policydb_index(struct policydb *p) > goto out; > > for (i = 0; i < SYM_NUM; i++) { > - rc = -ENOMEM; > p->sym_val_to_name[i] = flex_array_alloc(sizeof(char *), > p->symtab[i].nprim, > GFP_KERNEL | __GFP_ZERO); > if (!p->sym_val_to_name[i]) > - goto out; > + return -ENOMEM; > > rc = flex_array_prealloc(p->sym_val_to_name[i], > 0, p->symtab[i].nprim, > -- > 2.12.2 > -- paul moore www.paul-moore.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: paul@paul-moore.com (Paul Moore) Date: Tue, 16 May 2017 14:28:28 -0400 Subject: [PATCH 1/3] selinux: Return directly after a failed memory allocation in policydb_index() In-Reply-To: <8a517289-e5a7-8dde-0f5f-9e57f3e270c7@users.sourceforge.net> References: <5704e656-708a-b611-5611-70fc65dc67e8@users.sourceforge.net> <8a517289-e5a7-8dde-0f5f-9e57f3e270c7@users.sourceforge.net> Message-ID: To: linux-security-module@vger.kernel.org List-Id: linux-security-module.vger.kernel.org On Tue, Apr 4, 2017 at 7:12 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Tue, 4 Apr 2017 10:20:46 +0200 > > Replace five goto statements (and previous variable assignments) by > direct returns after a memory allocation failure in this function. > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) Merged. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index 0080122760ad..87d645d3a39f 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -538,34 +538,30 @@ static int policydb_index(struct policydb *p) > symtab_hash_eval(p->symtab); > #endif > > - rc = -ENOMEM; > 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; > + return -ENOMEM; > > - rc = -ENOMEM; > 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; > + return -ENOMEM; > > - rc = -ENOMEM; > 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; > + return -ENOMEM; > > /* Yes, I want the sizeof the pointer, not the structure */ > - rc = -ENOMEM; > p->type_val_to_struct_array = flex_array_alloc(sizeof(struct type_datum *), > p->p_types.nprim, > GFP_KERNEL | __GFP_ZERO); > if (!p->type_val_to_struct_array) > - goto out; > + return -ENOMEM; > > rc = flex_array_prealloc(p->type_val_to_struct_array, 0, > p->p_types.nprim, GFP_KERNEL | __GFP_ZERO); > @@ -577,12 +573,11 @@ static int policydb_index(struct policydb *p) > goto out; > > for (i = 0; i < SYM_NUM; i++) { > - rc = -ENOMEM; > p->sym_val_to_name[i] = flex_array_alloc(sizeof(char *), > p->symtab[i].nprim, > GFP_KERNEL | __GFP_ZERO); > if (!p->sym_val_to_name[i]) > - goto out; > + return -ENOMEM; > > rc = flex_array_prealloc(p->sym_val_to_name[i], > 0, p->symtab[i].nprim, > -- > 2.12.2 > -- 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