Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / security / apparmor / context.c

diff --git a/security/apparmor/context.c b/security/apparmor/context.c
index 71e9910cca7bf7e6f32efb6abe87c59428aa346a..1fc16b88efbf7543b424effd19231b08bf7ab824 100644 (file)
--- a/security/apparmor/context.c
+++ b/security/apparmor/context.c
@@ -95,7 +95,7 @@ int aa_replace_current_profile(struct aa_profile *profile)
 {
        struct aa_task_ctx *ctx = current_ctx();
        struct cred *new;
-       BUG_ON(!profile);
+       AA_BUG(!profile);
 
        if (ctx->profile == profile)
                return 0;
@@ -166,7 +166,7 @@ int aa_set_current_hat(struct aa_profile *profile, u64 token)
        struct cred *new = prepare_creds();
        if (!new)
                return -ENOMEM;
-       BUG_ON(!profile);
+       AA_BUG(!profile);
 
        ctx = cred_ctx(new);
        if (!ctx->previous) {