From: John Johansen <john.johansen@canonical.com>
Date: Mon, 16 Jan 2017 08:42:32 +0000 (-0800)
Subject: apparmor: update policy_destroy to use new debug asserts
X-Git-Tag: v4.11-rc1~138^2~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fd1b95fc9b96629d185f5fe3d9342fcff78eb30;p=thirdparty%2Fkernel%2Flinux.git

apparmor: update policy_destroy to use new debug asserts

Signed-off-by: John Johansen <john.johansen@canonical.com>
---

diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index bcd598c7ca9d1..5d8ef31a60f1c 100644
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -197,15 +197,8 @@ bool aa_policy_init(struct aa_policy *policy, const char *prefix,
  */
 void aa_policy_destroy(struct aa_policy *policy)
 {
-	/* still contains profiles -- invalid */
-	if (on_list_rcu(&policy->profiles)) {
-		AA_ERROR("%s: internal error, policy '%s' contains profiles\n",
-			 __func__, policy->name);
-	}
-	if (on_list_rcu(&policy->list)) {
-		AA_ERROR("%s: internal error, policy '%s' still on list\n",
-			 __func__, policy->name);
-	}
+	AA_BUG(on_list_rcu(&policy->profiles));
+	AA_BUG(on_list_rcu(&policy->list));
 
 	/* don't free name as its a subset of hname */
 	kzfree(policy->hname);