| Message ID | 1619604015-117734-1-git-send-email-jiapeng.chong@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Paul Moore |
| Headers | show |
| Series | selinux: Remove redundant assignment to rc | expand |
On Wed, Apr 28, 2021 at 6:00 AM Jiapeng Chong <jiapeng.chong@linux.alibaba.com> wrote: > > 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: Abaci Robot <abaci@linux.alibaba.com> > Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> > --- > security/selinux/ss/policydb.c | 1 - > security/selinux/ss/services.c | 4 ---- > 2 files changed, 5 deletions(-) Merged into selinux/next, thanks.
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 9fccf41..defc5ef 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -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]); diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index f0ba826..3331766 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -2059,7 +2059,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)); @@ -2068,7 +2067,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) @@ -2076,7 +2074,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)); @@ -2100,7 +2097,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");
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: Abaci Robot <abaci@linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> --- security/selinux/ss/policydb.c | 1 - security/selinux/ss/services.c | 4 ---- 2 files changed, 5 deletions(-)