| Message ID | caec05bb-b2ae-eda6-f052-32ed1d7c8c47@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jan 15, 2017 at 10:34 AM, SF Markus Elfring <elfring@users.sourceforge.net> wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Sun, 15 Jan 2017 11:15:19 +0100 > > Return directly after a call of the function "kzalloc" failed > at the beginning. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > security/selinux/ss/policydb.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Merged, thanks. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index 9035e5329ceb..551685283399 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -1150,10 +1150,9 @@ static int common_read(struct policydb *p, struct hashtab *h, void *fp) > u32 len, nel; > int i, rc; > > - rc = -ENOMEM; > comdatum = kzalloc(sizeof(*comdatum), GFP_KERNEL); > if (!comdatum) > - goto bad; > + return -ENOMEM; > > rc = next_entry(buf, fp, sizeof buf); > if (rc) > -- > 2.11.0 >
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 9035e5329ceb..551685283399 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -1150,10 +1150,9 @@ static int common_read(struct policydb *p, struct hashtab *h, void *fp) u32 len, nel; int i, rc; - rc = -ENOMEM; comdatum = kzalloc(sizeof(*comdatum), GFP_KERNEL); if (!comdatum) - goto bad; + return -ENOMEM; rc = next_entry(buf, fp, sizeof buf); if (rc)