From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753653AbdC2PcA (ORCPT ); Wed, 29 Mar 2017 11:32:00 -0400 Received: from mail-vk0-f67.google.com ([209.85.213.67]:35339 "EHLO mail-vk0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753613AbdC2PaY (ORCPT ); Wed, 29 Mar 2017 11:30:24 -0400 MIME-Version: 1.0 X-Originating-IP: [108.49.102.27] In-Reply-To: References: From: Paul Moore Date: Wed, 29 Mar 2017 11:30:17 -0400 Message-ID: Subject: Re: [PATCH 34/46] selinux: Return directly after a failed kzalloc() in common_read() 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:34 AM, SF Markus Elfring wrote: > From: Markus Elfring > 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 > --- > 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 > -- paul moore www.paul-moore.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Moore Date: Wed, 29 Mar 2017 15:30:17 +0000 Subject: Re: [PATCH 34/46] selinux: Return directly after a failed kzalloc() in common_read() Message-Id: List-Id: References: In-Reply-To: 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:34 AM, SF Markus Elfring wrote: > From: Markus Elfring > 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 > --- > 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 > -- paul moore www.paul-moore.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: paul@paul-moore.com (Paul Moore) Date: Wed, 29 Mar 2017 11:30:17 -0400 Subject: [PATCH 34/46] selinux: Return directly after a failed kzalloc() in common_read() In-Reply-To: References: Message-ID: To: linux-security-module@vger.kernel.org List-Id: linux-security-module.vger.kernel.org On Sun, Jan 15, 2017 at 10:34 AM, SF Markus Elfring wrote: > From: Markus Elfring > 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 > --- > 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 > -- 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