[PATCH 33/46] selinux: Move an assignment for the variable "rc" in class_read()
From: paul@paul-moore.com (Paul Moore)
Date: 2017-03-29 15:29:38
Also in:
kernel-janitors, lkml, selinux
On Sun, Jan 15, 2017 at 10:33 AM, SF Markus Elfring [off-list ref] wrote:
From: Markus Elfring <redacted> Date: Sun, 15 Jan 2017 11:10:39 +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 <redacted> --- security/selinux/ss/policydb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Dropped for reasons already discussed.
quoted hunk
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 3af2b0849495..9035e5329ceb 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c@@ -1345,10 +1345,10 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) if (rc) goto bad; - rc = -EINVAL; cladatum->comdatum = hashtab_search(p->p_commons.table, cladatum->comkey); if (!cladatum->comdatum) { printk(KERN_ERR "SELinux: unknown common %s\n", cladatum->comkey); + rc = -EINVAL; goto bad; } } --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