[PATCH 33/46] selinux: Move an assignment for the variable "rc" in class_read()

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
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 <elfr...@users.sourceforge.net>
---
 security/selinux/ss/policydb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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