summaryrefslogtreecommitdiffstats
path: root/security/apparmor/context.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2017-01-16 00:43:15 -0800
committerJohn Johansen <john.johansen@canonical.com>2017-01-16 01:18:56 -0800
commite6bfa25deb5096c05a08f01e4d6a436dd331fa88 (patch)
tree5db7ff5a4ec43181058deb41fdcf403006fe3b42 /security/apparmor/context.c
parent2c17cd3681eab6d5d380dcfd073b5ee8c3440e7e (diff)
downloadlinux-e6bfa25deb5096c05a08f01e4d6a436dd331fa88.tar.bz2
apparmor: replace remaining BUG_ON() asserts with AA_BUG()
AA_BUG() uses WARN and won't break the kernel like BUG_ON(). Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/context.c')
-rw-r--r--security/apparmor/context.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/context.c b/security/apparmor/context.c
index 71e9910cca7b..1fc16b88efbf 100644
--- 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) {