| Message ID | 9202247d-8f44-8839-cf78-453b6e3b7d1e@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jan 15, 2017 at 10:37 AM, SF Markus Elfring <elfring@users.sourceforge.net> wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Sun, 15 Jan 2017 11:24:51 +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 <elfring@users.sourceforge.net> > --- > security/selinux/ss/policydb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Dropped as previously discussed. > diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c > index 7cf635c650dc..faa6ecc2450d 100644 > --- a/security/selinux/ss/policydb.c > +++ b/security/selinux/ss/policydb.c > @@ -897,10 +897,10 @@ int policydb_load_isids(struct policydb *p, struct sidtab *s) > > head = p->ocontexts[OCON_ISID]; > for (c = head; c; c = c->next) { > - rc = -EINVAL; > if (!c->context[0].user) { > printk(KERN_ERR "SELinux: SID %s was never defined.\n", > c->u.name); > + rc = -EINVAL; > goto out; > } > > -- > 2.11.0 >
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 7cf635c650dc..faa6ecc2450d 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -897,10 +897,10 @@ int policydb_load_isids(struct policydb *p, struct sidtab *s) head = p->ocontexts[OCON_ISID]; for (c = head; c; c = c->next) { - rc = -EINVAL; if (!c->context[0].user) { printk(KERN_ERR "SELinux: SID %s was never defined.\n", c->u.name); + rc = -EINVAL; goto out; }