Messages in this thread Patch in this message | | | From | Michal Orzel <> | Subject | [PATCH 1/5] apparmor: Remove redundant assignments | Date | Thu, 31 Mar 2022 19:33:54 +0200 |
| |
Get rid of redundant assignments which end up in values not being read either because they are overwritten or the function ends.
Reported by clang-tidy [deadcode.DeadStores]
Signed-off-by: Michal Orzel <michalorzel.eng@gmail.com> --- security/apparmor/domain.c | 3 +-- security/apparmor/label.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index a29e69d2c300..77724acd9d8a 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c @@ -627,7 +627,6 @@ static struct aa_label *profile_transition(struct aa_profile *profile, { struct aa_label *new = NULL; const char *info = NULL, *name = NULL, *target = NULL; - unsigned int state = profile->file.start; struct aa_perms perms = {}; bool nonewprivs = false; int error = 0; @@ -661,7 +660,7 @@ static struct aa_label *profile_transition(struct aa_profile *profile, } /* find exec permissions for name */ - state = aa_str_perms(profile->file.dfa, state, name, cond, &perms); + aa_str_perms(profile->file.dfa, profile->file.start, name, cond, &perms); if (perms.allow & MAY_EXEC) { /* exec permission determine how to transition */ new = x_to_label(profile, bprm, name, perms.xindex, &target, diff --git a/security/apparmor/label.c b/security/apparmor/label.c index 0b0265da1926..ce9ae9b6b303 100644 --- a/security/apparmor/label.c +++ b/security/apparmor/label.c @@ -807,7 +807,7 @@ bool aa_label_replace(struct aa_label *old, struct aa_label *new) struct aa_labelset *ls = labels_set(old); write_lock_irqsave(&ls->lock, flags); - res = __label_remove(old, new); + __label_remove(old, new); if (labels_ns(old) != labels_ns(new)) { write_unlock_irqrestore(&ls->lock, flags); ls = labels_set(new); -- 2.25.1
| |