Commit e6bfa25d authored by John Johansen's avatar John Johansen

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: default avatarJohn Johansen <john.johansen@canonical.com>
parent 2c17cd36
...@@ -91,7 +91,7 @@ static struct aa_loaddata *aa_simple_write_to_buffer(const char __user *userbuf, ...@@ -91,7 +91,7 @@ static struct aa_loaddata *aa_simple_write_to_buffer(const char __user *userbuf,
{ {
struct aa_loaddata *data; struct aa_loaddata *data;
BUG_ON(copy_size > alloc_size); AA_BUG(copy_size > alloc_size);
if (*pos != 0) if (*pos != 0)
/* only writes from pos 0, that is complete writes */ /* only writes from pos 0, that is complete writes */
......
...@@ -119,7 +119,7 @@ void aa_audit_msg(int type, struct common_audit_data *sa, ...@@ -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, int aa_audit(int type, struct aa_profile *profile, struct common_audit_data *sa,
void (*cb) (struct audit_buffer *, void *)) void (*cb) (struct audit_buffer *, void *))
{ {
BUG_ON(!profile); AA_BUG(!profile);
if (type == AUDIT_APPARMOR_AUTO) { if (type == AUDIT_APPARMOR_AUTO) {
if (likely(!aad(sa)->error)) { if (likely(!aad(sa)->error)) {
......
...@@ -95,7 +95,7 @@ int aa_replace_current_profile(struct aa_profile *profile) ...@@ -95,7 +95,7 @@ int aa_replace_current_profile(struct aa_profile *profile)
{ {
struct aa_task_ctx *ctx = current_ctx(); struct aa_task_ctx *ctx = current_ctx();
struct cred *new; struct cred *new;
BUG_ON(!profile); AA_BUG(!profile);
if (ctx->profile == profile) if (ctx->profile == profile)
return 0; return 0;
...@@ -166,7 +166,7 @@ int aa_set_current_hat(struct aa_profile *profile, u64 token) ...@@ -166,7 +166,7 @@ int aa_set_current_hat(struct aa_profile *profile, u64 token)
struct cred *new = prepare_creds(); struct cred *new = prepare_creds();
if (!new) if (!new)
return -ENOMEM; return -ENOMEM;
BUG_ON(!profile); AA_BUG(!profile);
ctx = cred_ctx(new); ctx = cred_ctx(new);
if (!ctx->previous) { if (!ctx->previous) {
......
...@@ -406,7 +406,7 @@ static int common_file_perm(const char *op, struct file *file, u32 mask) ...@@ -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); struct aa_profile *profile, *fprofile = aa_cred_profile(file->f_cred);
int error = 0; int error = 0;
BUG_ON(!fprofile); AA_BUG(!fprofile);
if (!file->f_path.mnt || if (!file->f_path.mnt ||
!path_mediated_fs(file->f_path.dentry)) !path_mediated_fs(file->f_path.dentry))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment