[apparmor] [PATCH 04/10] apparmor: use aa_get_newest_profile_condref helpers in update_to_newest_parent

[Ryan Lee via AppArmor]

Signed-off-by: Ryan Lee <ryan....@canonical.com>
---
 security/apparmor/policy.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 9475f6455542..be939a8332f6 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -1138,21 +1138,22 @@ static void share_name(struct aa_profile *old, struct 
aa_profile *new)
 static struct aa_profile *update_to_newest_parent(struct aa_profile *new)
 {
        struct aa_profile *parent, *newest;
+       bool needput;
 
        parent = rcu_dereference_protected(new->parent,
                                           mutex_is_locked(&new->ns->lock));
-       newest = aa_get_newest_profile(parent);
+       newest = aa_get_newest_profile_condref(parent, &needput);
 
        /* parent replaced in this atomic set? */
        if (newest != parent) {
                rcu_assign_pointer(new->parent, newest);
        }
-       /* Unconditionally put the parent:
+       /* put the parent instead of newest, if necessary:
         * If parent != newest, we aren't using the parent anymore
-        * If parent == newest, we got an extra ref to it, so put it and
-        *   retain the other ref we have to newest
+        * If parent == newest, we may have gotten an extra ref to it,
+        *   so put it and retain the other ref we have to newest
         */
-       aa_put_profile(parent);
+       aa_put_profile_condref(parent, needput);
 
        return newest;
 }
-- 
2.43.0