Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d97d51d2 authored by John Johansen's avatar John Johansen
Browse files

apparmor: rename PFLAG_INVALID to PFLAG_STALE 



Invalid does not convey the meaning of the flag anymore so rename it.

Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 121d4a91

security/apparmor/include/context.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

security/apparmor/include/policy.h

+3 −3
Original line number Diff line number Diff line
@@ -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);

security/apparmor/policy.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}