apparmor: replace remaining BUG_ON() asserts with AA_BUG()

jrjohansen · jrjohansen · commit e6bfa25deb50 · 2017-01-16T01:18:56.000-08:00
AA_BUG() uses WARN and won't break the kernel like BUG_ON().

Signed-off-by: John Johansen &lt;john.johansen@canonical.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ static struct aa_loaddata aa_simple_write_to_buffer(const char __user userbuf,`
`91`	`91`	`{`
`92`	`92`	`struct aa_loaddata *data;`
`93`	`93`
`94`		`- BUG_ON(copy_size > alloc_size);`
	`94`	`+ AA_BUG(copy_size > alloc_size);`
`95`	`95`
`96`	`96`	`if (*pos != 0)`
`97`	`97`	`/* only writes from pos 0, that is complete writes */`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ void aa_audit_msg(int type, struct common_audit_data *sa,`
`119`	`119`	`int aa_audit(int type, struct aa_profile profile, struct common_audit_data sa,`
`120`	`120`	`void (cb) (struct audit_buffer , void *))`
`121`	`121`	`{`
`122`		`- BUG_ON(!profile);`
	`122`	`+ AA_BUG(!profile);`
`123`	`123`
`124`	`124`	`if (type == AUDIT_APPARMOR_AUTO) {`
`125`	`125`	`if (likely(!aad(sa)->error)) {`