From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751139AbdAQQdE (ORCPT ); Tue, 17 Jan 2017 11:33:04 -0500 Received: from nm27-vm2.bullet.mail.ne1.yahoo.com ([98.138.91.215]:54479 "EHLO nm27-vm2.bullet.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922AbdAQQdB (ORCPT ); Tue, 17 Jan 2017 11:33:01 -0500 X-Yahoo-Newman-Id: 879598.29362.bm@smtp225.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: m5rd0OMVM1l6PSwZSwkznCykr8vRpwgasMWLoCC2qzTep4V X2Qo.D3YmOislC4hdC4YZ414ZWYMHTzzhR2Hb73MKi4a287TVtg7NlJ4PAom 23CA8G1Q3mMuYkI2r17VaxebGG.lk1.6jLiKes9I8pcEij2T0taUrpE9c4DB EqOM0w4457Ugz93mDf.mfZmp1hxPjU1Cx48KQS8NTbeilEswP55NNtzyn2PX DntqUDsKO26vzO.ks0Qu40jFsTFUeg4lp2vkm8u.NWv6Df9ljobiUUJ6iyTB r8OtTrdLBDk8HOVdw_y2J2eoUWL5m5LQgkS6rD678KLqkzeQ9cqTtNBvia8W PKCfjBE_PnUr1qNzxjJveb1dv2pG2QBDB4EN_J9uB3LEC.rJ1GXJasPYM.v0 6fbzBeHQqjJUgrfwyH851OUGVjFNTkQNbzFHx3EZVme8yvPc0IHjUTD_5BNn ibSUGHMmVH2mgETCbBZrihDlRWkTkUdAqEnK0fIt5qGgcr8kXxlXIIS2RiH1 RYDXLMKgeo6GcfjPYpYNHRHJg3nMkVHCGOxwUCClSt_vlE06FSL59J.U- X-Yahoo-SMTP: OIJXglSswBDfgLtXluJ6wiAYv6_cnw-- Subject: Re: [PATCH 15/46] selinux: One check and function call less in genfs_read() after error detection To: SF Markus Elfring , linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, Eric Paris , James Morris , Paul Moore , "Serge E. Hallyn" , Stephen Smalley , William Roberts References: Cc: LKML , kernel-janitors@vger.kernel.org From: Casey Schaufler Message-ID: Date: Tue, 17 Jan 2017 08:32:43 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 1/15/2017 7:15 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sat, 14 Jan 2017 18:29:20 +0100 > > Adjust a jump target to avoid a check repetition at the end after a memory > allocation failed for the local variable "newgenfs". > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index 5dc31faa601f..e7b882251da8 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -2015,7 +2015,7 @@ static int genfs_read(struct policydb *p, void *fp) > newgenfs = kzalloc(sizeof(*newgenfs), GFP_KERNEL); > if (!newgenfs) { > rc = -ENOMEM; > - goto out; > + goto exit; > } > > rc = str_read(&newgenfs->fstype, GFP_KERNEL, fp, len); > @@ -2101,7 +2101,7 @@ static int genfs_read(struct policydb *p, void *fp) > kfree(newgenfs); > } > ocontext_destroy(newc, OCON_FSUSE); > - > +exit: > return rc; Why not replace the "goto out" with "return rc" rather than add a target? > } > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Casey Schaufler Date: Tue, 17 Jan 2017 16:32:43 +0000 Subject: Re: [PATCH 15/46] selinux: One check and function call less in genfs_read() after error detection Message-Id: List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: SF Markus Elfring , linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, Eric Paris , James Morris , Paul Moore , "Serge E. Hallyn" , Stephen Smalley , William Roberts Cc: LKML , kernel-janitors@vger.kernel.org On 1/15/2017 7:15 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sat, 14 Jan 2017 18:29:20 +0100 > > Adjust a jump target to avoid a check repetition at the end after a memory > allocation failed for the local variable "newgenfs". > > Signed-off-by: Markus Elfring > --- > security/selinux/ss/policydb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index 5dc31faa601f..e7b882251da8 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -2015,7 +2015,7 @@ static int genfs_read(struct policydb *p, void *fp) > newgenfs = kzalloc(sizeof(*newgenfs), GFP_KERNEL); > if (!newgenfs) { > rc = -ENOMEM; > - goto out; > + goto exit; > } > > rc = str_read(&newgenfs->fstype, GFP_KERNEL, fp, len); > @@ -2101,7 +2101,7 @@ static int genfs_read(struct policydb *p, void *fp) > kfree(newgenfs); > } > ocontext_destroy(newc, OCON_FSUSE); > - > +exit: > return rc; Why not replace the "goto out" with "return rc" rather than add a target? > } >