From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753047AbdC2Oxb (ORCPT ); Wed, 29 Mar 2017 10:53:31 -0400 Received: from mail-vk0-f66.google.com ([209.85.213.66]:33101 "EHLO mail-vk0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751738AbdC2Ox0 (ORCPT ); Wed, 29 Mar 2017 10:53:26 -0400 MIME-Version: 1.0 X-Originating-IP: [108.49.102.27] In-Reply-To: <6b93ee88-d4c0-b5e3-6f7e-fc74acfddd43@users.sourceforge.net> References: <6b93ee88-d4c0-b5e3-6f7e-fc74acfddd43@users.sourceforge.net> From: Paul Moore Date: Wed, 29 Mar 2017 10:53:24 -0400 Message-ID: Subject: Re: [PATCH 27/46] selinux: Move an assignment for the variable "rc" in sens_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:27 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sat, 14 Jan 2017 22:02:14 +0100 > > A local variable was set to an error code in one case before a concrete > error situation was detected. Thus move the corresponding assignment into > an if branch to indicate a software failure there. > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Dropped for reasons previously discussed. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index edfcfd3bbc60..3e43556e67b8 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -1608,10 +1608,11 @@ static int sens_read(struct policydb *p, struct hashtab *h, void *fp) > if (rc) > goto bad; > > - rc = -ENOMEM; > levdatum->level = kmalloc(sizeof(*levdatum->level), GFP_ATOMIC); > - if (!levdatum->level) > + if (!levdatum->level) { > + rc = -ENOMEM; > goto bad; > + } > > rc = mls_read_level(levdatum->level, fp); > 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 14:53:24 +0000 Subject: Re: [PATCH 27/46] selinux: Move an assignment for the variable "rc" in sens_read() Message-Id: List-Id: References: <6b93ee88-d4c0-b5e3-6f7e-fc74acfddd43@users.sourceforge.net> In-Reply-To: <6b93ee88-d4c0-b5e3-6f7e-fc74acfddd43@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:27 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sat, 14 Jan 2017 22:02:14 +0100 > > A local variable was set to an error code in one case before a concrete > error situation was detected. Thus move the corresponding assignment into > an if branch to indicate a software failure there. > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Dropped for reasons previously discussed. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index edfcfd3bbc60..3e43556e67b8 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -1608,10 +1608,11 @@ static int sens_read(struct policydb *p, struct hashtab *h, void *fp) > if (rc) > goto bad; > > - rc = -ENOMEM; > levdatum->level = kmalloc(sizeof(*levdatum->level), GFP_ATOMIC); > - if (!levdatum->level) > + if (!levdatum->level) { > + rc = -ENOMEM; > goto bad; > + } > > rc = mls_read_level(levdatum->level, fp); > 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 10:53:24 -0400 Subject: [PATCH 27/46] selinux: Move an assignment for the variable "rc" in sens_read() In-Reply-To: <6b93ee88-d4c0-b5e3-6f7e-fc74acfddd43@users.sourceforge.net> References: <6b93ee88-d4c0-b5e3-6f7e-fc74acfddd43@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:27 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sat, 14 Jan 2017 22:02:14 +0100 > > A local variable was set to an error code in one case before a concrete > error situation was detected. Thus move the corresponding assignment into > an if branch to indicate a software failure there. > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Dropped for reasons previously discussed. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index edfcfd3bbc60..3e43556e67b8 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -1608,10 +1608,11 @@ static int sens_read(struct policydb *p, struct hashtab *h, void *fp) > if (rc) > goto bad; > > - rc = -ENOMEM; > levdatum->level = kmalloc(sizeof(*levdatum->level), GFP_ATOMIC); > - if (!levdatum->level) > + if (!levdatum->level) { > + rc = -ENOMEM; > goto bad; > + } > > rc = mls_read_level(levdatum->level, fp); > 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