From d97d51d253e08e059bba40002407ec3d188feafb Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Mon, 16 Jan 2017 00:42:18 -0800
Subject: [PATCH] apparmor: rename PFLAG_INVALID to PFLAG_STALE
Invalid does not convey the meaning of the flag anymore so rename it.
Signed-off-by: John Johansen <john.johansen@canonical.com>
---
security/apparmor/include/context.h | 2 +-
security/apparmor/include/policy.h | 6 +++---
security/apparmor/policy.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/security/apparmor/include/context.h b/security/apparmor/include/context.h
index 6bf65798e5d1..a0acc2390fae 100644
--- a/security/apparmor/include/context.h
+++ b/security/apparmor/include/context.h
@@ -152,7 +152,7 @@ static inline struct aa_profile *aa_current_profile(void)
struct aa_profile *profile;
BUG_ON(!cxt || !cxt->profile);
- if (PROFILE_INVALID(cxt->profile)) {
+ if (profile_is_stale(cxt->profile)) {
profile = aa_get_newest_profile(cxt->profile);
aa_replace_current_profile(profile);
aa_put_profile(profile);
diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
index 415f8ab0b11e..56bef768c7eb 100644
--- a/security/apparmor/include/policy.h
+++ b/security/apparmor/include/policy.h
@@ -46,7 +46,7 @@ extern const char *const aa_profile_mode_names[];
#define PROFILE_IS_HAT(_profile) ((_profile)->flags & PFLAG_HAT)
-#define PROFILE_INVALID(_profile) ((_profile)->flags & PFLAG_INVALID)
+#define profile_is_stale(_profile) ((_profile)->flags & PFLAG_STALE)
#define on_list_rcu(X) (!list_empty(X) && (X)->prev != LIST_POISON2)
@@ -71,7 +71,7 @@ enum profile_flags {
PFLAG_USER_DEFINED = 0x20, /* user based profile - lower privs */
PFLAG_NO_LIST_REF = 0x40, /* list doesn't keep profile ref */
PFLAG_OLD_NULL_TRANS = 0x100, /* use // as the null transition */
- PFLAG_INVALID = 0x200, /* profile replaced/removed */
+ PFLAG_STALE = 0x200, /* profile replaced/removed */
PFLAG_NS_COUNT = 0x400, /* carries NS ref count */
/* These flags must correspond with PATH_flags */
@@ -253,7 +253,7 @@ static inline struct aa_profile *aa_get_newest_profile(struct aa_profile *p)
if (!p)
return NULL;
- if (PROFILE_INVALID(p))
+ if (profile_is_stale(p))
return aa_get_profile_rcu(&p->replacedby->profile);
return aa_get_profile(p);
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 2dd8717a5a89..edc81a0d0cb4 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -106,7 +106,7 @@ void __aa_update_replacedby(struct aa_profile *orig, struct aa_profile *new)
tmp = rcu_dereference_protected(orig->replacedby->profile,
mutex_is_locked(&orig->ns->lock));
rcu_assign_pointer(orig->replacedby->profile, aa_get_profile(new));
- orig->flags |= PFLAG_INVALID;
+ orig->flags |= PFLAG_STALE;
aa_put_profile(tmp);
}