summaryrefslogtreecommitdiffstats
path: root/security
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
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')
-rw-r--r--security/apparmor/apparmorfs.c2
-rw-r--r--security/apparmor/audit.c2
-rw-r--r--security/apparmor/context.c4
-rw-r--r--security/apparmor/lsm.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 6834000640d7..41073f70eb41 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -91,7 +91,7 @@ static struct aa_loaddata *aa_simple_write_to_buffer(const char __user *userbuf,
{
struct aa_loaddata *data;
- BUG_ON(copy_size > alloc_size);
+ AA_BUG(copy_size > alloc_size);
if (*pos != 0)
/* only writes from pos 0, that is complete writes */
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
index 0c81ff64993b..87f40fa8c431 100644
--- a/security/apparmor/audit.c
+++ b/security/apparmor/audit.c
@@ -119,7 +119,7 @@ void aa_audit_msg(int type, struct common_audit_data *sa,
int aa_audit(int type, struct aa_profile *profile, struct common_audit_data *sa,
void (*cb) (struct audit_buffer *, void *))
{
- BUG_ON(!profile);
+ AA_BUG(!profile);
if (type == AUDIT_APPARMOR_AUTO) {
if (likely(!aad(sa)->error)) {
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) {
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index fc82ac0247dc..0dd48184946a 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -406,7 +406,7 @@ static int common_file_perm(const char *op, struct file *file, u32 mask)
struct aa_profile *profile, *fprofile = aa_cred_profile(file->f_cred);
int error = 0;
- BUG_ON(!fprofile);
+ AA_BUG(!fprofile);
if (!file->f_path.mnt ||
!path_mediated_fs(file->f_path.dentry))