Commit fd781f45 authored by Jiapeng Chong's avatar Jiapeng Chong Committed by Paul Moore
Browse files

selinux: Remove redundant assignment to rc 



Variable rc is set to '-EINVAL' but this value is never read as
it is overwritten or not used later on, hence it is a redundant
assignment and can be removed.

Cleans up the following clang-analyzer warning:

security/selinux/ss/services.c:2103:3: warning: Value stored to 'rc' is
never read [clang-analyzer-deadcode.DeadStores].

security/selinux/ss/services.c:2079:2: warning: Value stored to 'rc' is
never read [clang-analyzer-deadcode.DeadStores].

security/selinux/ss/services.c:2071:2: warning: Value stored to 'rc' is
never read [clang-analyzer-deadcode.DeadStores].

security/selinux/ss/services.c:2062:2: warning: Value stored to 'rc' is
never read [clang-analyzer-deadcode.DeadStores].

security/selinux/ss/policydb.c:2592:3: warning: Value stored to 'rc' is
never read [clang-analyzer-deadcode.DeadStores].

Reported-by: default avatarAbaci Robot <abaci@linux.alibaba.com>
Signed-off-by: default avatarJiapeng Chong <jiapeng.chong@linux.alibaba.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 7cffc377

security/selinux/ss/policydb.c

+0 −1
Original line number Diff line number Diff line
@@ -2589,7 +2589,6 @@ int policydb_read(struct policydb *p, void *fp) 
		if (rc)

			goto bad;



		rc = -EINVAL;

		rtk->role = le32_to_cpu(buf[0]);

		rtk->type = le32_to_cpu(buf[1]);

		rtd->new_role = le32_to_cpu(buf[2]);

security/selinux/ss/services.c

+0 −4
Original line number Diff line number Diff line
@@ -2060,7 +2060,6 @@ static int convert_context(struct context *oldc, struct context *newc, void *p) 
	context_init(newc);



	/* Convert the user. */

	rc = -EINVAL;

	usrdatum = symtab_search(&args->newp->p_users,

				 sym_name(args->oldp,

					  SYM_USERS, oldc->user - 1));
@@ -2069,7 +2068,6 @@ static int convert_context(struct context *oldc, struct context *newc, void *p) 
	newc->user = usrdatum->value;



	/* Convert the role. */

	rc = -EINVAL;

	role = symtab_search(&args->newp->p_roles,

			     sym_name(args->oldp, SYM_ROLES, oldc->role - 1));

	if (!role)
@@ -2077,7 +2075,6 @@ static int convert_context(struct context *oldc, struct context *newc, void *p) 
	newc->role = role->value;



	/* Convert the type. */

	rc = -EINVAL;

	typdatum = symtab_search(&args->newp->p_types,

				 sym_name(args->oldp,

					  SYM_TYPES, oldc->type - 1));
@@ -2101,7 +2098,6 @@ static int convert_context(struct context *oldc, struct context *newc, void *p) 
		oc = args->newp->ocontexts[OCON_ISID];

		while (oc && oc->sid[0] != SECINITSID_UNLABELED)

			oc = oc->next;

		rc = -EINVAL;

		if (!oc) {

			pr_err("SELinux:  unable to look up"

				" the initial SIDs list\n");