Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / security / apparmor / include / context.h

diff --git a/security/apparmor/include/context.h b/security/apparmor/include/context.h
index d44ba5802e3dc03f56c6d183a9d97a3d608ee8e9..6bf65798e5d145e985a65f674273db20472ece67 100644 (file)
--- a/security/apparmor/include/context.h
+++ b/security/apparmor/include/context.h
@@ -98,7 +98,7 @@ static inline struct aa_profile *aa_cred_profile(const struct cred *cred)
 {
        struct aa_task_cxt *cxt = cred_cxt(cred);
        BUG_ON(!cxt || !cxt->profile);
-       return aa_newest_version(cxt->profile);
+       return cxt->profile;
 }
 
 /**
@@ -152,15 +152,14 @@ static inline struct aa_profile *aa_current_profile(void)
        struct aa_profile *profile;
        BUG_ON(!cxt || !cxt->profile);
 
-       profile = aa_newest_version(cxt->profile);
-       /*
-        * Whether or not replacement succeeds, use newest profile so
-        * there is no need to update it after replacement.
-        */
-       if (unlikely((cxt->profile != profile)))
+       if (PROFILE_INVALID(cxt->profile)) {
+               profile = aa_get_newest_profile(cxt->profile);
                aa_replace_current_profile(profile);
+               aa_put_profile(profile);
+               cxt = current_cxt();
+       }
 
-       return profile;
+       return cxt->profile;
 }
 
 /**