lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 29 Mar 2017 11:40:58 -0400 From: Paul Moore <paul@...l-moore.com> To: SF Markus Elfring <elfring@...rs.sourceforge.net> Cc: linux-security-module@...r.kernel.org, selinux@...ho.nsa.gov, Eric Paris <eparis@...isplace.org>, James Morris <james.l.morris@...cle.com>, "Serge E. Hallyn" <serge@...lyn.com>, Stephen Smalley <sds@...ho.nsa.gov>, William Roberts <william.c.roberts@...el.com>, LKML <linux-kernel@...r.kernel.org>, kernel-janitors@...r.kernel.org Subject: Re: [PATCH 41/46] selinux: Move two assignments for the variable "rc" in roles_init() On Sun, Jan 15, 2017 at 10:41 AM, SF Markus Elfring <elfring@...rs.sourceforge.net> wrote: > From: Markus Elfring <elfring@...rs.sourceforge.net> > Date: Sun, 15 Jan 2017 12:40:35 +0100 > > One local variable was set to an error code in two cases before > a concrete error situation was detected. Thus move the corresponding > assignments into if branches to indicate a software failure there. > > Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net> > --- > security/selinux/ss/policydb.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) Dropped for reasons previously discussed. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index ccc146bfd4c2..be445abf047b 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -182,15 +182,17 @@ static int roles_init(struct policydb *p) > if (!role) > return -ENOMEM; > > - rc = -EINVAL; > role->value = ++p->p_roles.nprim; > - if (role->value != OBJECT_R_VAL) > + if (role->value != OBJECT_R_VAL) { > + rc = -EINVAL; > goto out; > + } > > - rc = -ENOMEM; > key = kstrdup(OBJECT_R, GFP_KERNEL); > - if (!key) > + if (!key) { > + rc = -ENOMEM; > goto out; > + } > > rc = hashtab_insert(p->p_roles.table, key, role); > if (rc) > -- > 2.11.0 > -- paul moore www.paul-moore.com
Powered by blists - more mailing lists