From: Markus Elfring <[email protected]> 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 <[email protected]> --- security/selinux/ss/policydb.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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
