lkml.org 
[lkml]   [2011]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH 1/3] selinux: return -ENOMEM when memory allocation fails
From
Date
On Fri, 2011-01-21 at 11:07 +1100, James Morris wrote:
> On Thu, 20 Jan 2011, Davidlohr Bueso wrote:
>
> > From: Davidlohr Bueso <dave@gnu.org>
> >
> > Signed-off-by: Davidlohr Bueso <dave@gnu.org>
> > ---
> > security/selinux/ss/conditional.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
> > index c3f845c..a533732 100644
> > --- a/security/selinux/ss/conditional.c
> > +++ b/security/selinux/ss/conditional.c
> > @@ -178,7 +178,7 @@ int cond_init_bool_indexes(struct policydb *p)
> > p->bool_val_to_struct = (struct cond_bool_datum **)
> > kmalloc(p->p_bools.nprim * sizeof(struct cond_bool_datum *), GFP_KERNEL);
> > if (!p->bool_val_to_struct)
> > - return -1;
> > + return -ENOMEM;
> > return 0;
>
> The caller has already set -ENOMEM, so the code should probably be updated
> there, too, e.g.
>
> rc = cond_init_bool_indexes();
> if (rc)
> goto out;

Ah yes, thanks for pointing this out.

From: Davidlohr Bueso <dave@gnu.org>
Date: Fri, 21 Jan 2011 12:26:51 -0300
Subject: [PATCH] selinux: return -ENOMEM when memory allocation fails

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
security/selinux/ss/conditional.c | 2 +-
security/selinux/ss/policydb.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
index c3f845c..a533732 100644
--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
@@ -178,7 +178,7 @@ int cond_init_bool_indexes(struct policydb *p)
p->bool_val_to_struct = (struct cond_bool_datum **)
kmalloc(p->p_bools.nprim * sizeof(struct cond_bool_datum *), GFP_KERNEL);
if (!p->bool_val_to_struct)
- return -1;
+ return -ENOMEM;
return 0;
}

diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index be9de38..0ebf5b5 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -500,9 +500,9 @@ static int policydb_index(struct policydb *p)
p->p_types.nprim - 1, GFP_KERNEL | __GFP_ZERO);
if (rc)
goto out;
-
- rc = -ENOMEM;
- if (cond_init_bool_indexes(p))
+
+ rc = cond_init_bool_indexes(p);
+ if (rc)
goto out;

for (i = 0; i < SYM_NUM; i++) {
--
1.7.1





\
 
 \ /
  Last update: 2011-01-21 16:31    [W:0.044 / U:3.172 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site