From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752839AbdCWVyd (ORCPT ); Thu, 23 Mar 2017 17:54:33 -0400 Received: from mail-vk0-f68.google.com ([209.85.213.68]:34820 "EHLO mail-vk0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751444AbdCWVyb (ORCPT ); Thu, 23 Mar 2017 17:54:31 -0400 MIME-Version: 1.0 X-Originating-IP: [108.49.102.27] In-Reply-To: <202d7312-b266-ce9d-8f7a-3e8282c7b0c5@users.sourceforge.net> References: <202d7312-b266-ce9d-8f7a-3e8282c7b0c5@users.sourceforge.net> From: Paul Moore Date: Thu, 23 Mar 2017 17:54:29 -0400 Message-ID: Subject: Re: [PATCH 14/46] selinux: One function call less in genfs_read() after null pointer detection 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:14 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sat, 14 Jan 2017 17:43:47 +0100 > > Call the function "kfree" at the end only after it was determined > that the local variable "newgenfs" contained a non-null pointer. > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Merged, thanks. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index a12d9166f0e4..5dc31faa601f 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -2096,9 +2096,10 @@ static int genfs_read(struct policydb *p, void *fp) > } > rc = 0; > out: > - if (newgenfs) > + if (newgenfs) { > kfree(newgenfs->fstype); > - kfree(newgenfs); > + kfree(newgenfs); > + } > ocontext_destroy(newc, OCON_FSUSE); > > return rc; > -- > 2.11.0 > -- paul moore www.paul-moore.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Moore Date: Thu, 23 Mar 2017 21:54:29 +0000 Subject: Re: [PATCH 14/46] selinux: One function call less in genfs_read() after null pointer detection Message-Id: List-Id: References: <202d7312-b266-ce9d-8f7a-3e8282c7b0c5@users.sourceforge.net> In-Reply-To: <202d7312-b266-ce9d-8f7a-3e8282c7b0c5@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:14 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sat, 14 Jan 2017 17:43:47 +0100 > > Call the function "kfree" at the end only after it was determined > that the local variable "newgenfs" contained a non-null pointer. > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Merged, thanks. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index a12d9166f0e4..5dc31faa601f 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -2096,9 +2096,10 @@ static int genfs_read(struct policydb *p, void *fp) > } > rc = 0; > out: > - if (newgenfs) > + if (newgenfs) { > kfree(newgenfs->fstype); > - kfree(newgenfs); > + kfree(newgenfs); > + } > ocontext_destroy(newc, OCON_FSUSE); > > return 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: Thu, 23 Mar 2017 17:54:29 -0400 Subject: [PATCH 14/46] selinux: One function call less in genfs_read() after null pointer detection In-Reply-To: <202d7312-b266-ce9d-8f7a-3e8282c7b0c5@users.sourceforge.net> References: <202d7312-b266-ce9d-8f7a-3e8282c7b0c5@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:14 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sat, 14 Jan 2017 17:43:47 +0100 > > Call the function "kfree" at the end only after it was determined > that the local variable "newgenfs" contained a non-null pointer. > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Merged, thanks. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index a12d9166f0e4..5dc31faa601f 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -2096,9 +2096,10 @@ static int genfs_read(struct policydb *p, void *fp) > } > rc = 0; > out: > - if (newgenfs) > + if (newgenfs) { > kfree(newgenfs->fstype); > - kfree(newgenfs); > + kfree(newgenfs); > + } > ocontext_destroy(newc, OCON_FSUSE); > > return 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