AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

selinux: replace some BUG_ON()s with a WARN_ON()

Browse Source 
We don't need to crash the machine in these cases. Let's just detect the
buggy state early and error out with a warning.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Reviewed-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Ondrej Mosnacek 2019-01-25 11:06:49 +01:00 committed by Paul Moore
parent a2c513835b
commit 994fb0651d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/selinux/avc.c
View File

@ -678,7 +678,6 @@ static void avc_audit_pre_callback(struct audit_buffer *ab, void *a)
return; return;
} }
BUG_ON(!sad->tclass || sad->tclass >= ARRAY_SIZE(secclass_map));
perms = secclass_map[sad->tclass-1].perms; perms = secclass_map[sad->tclass-1].perms;
audit_log_string(ab, " {"); audit_log_string(ab, " {");
@ -731,7 +730,6 @@ static void avc_audit_post_callback(struct audit_buffer *ab, void *a)
kfree(scontext); kfree(scontext);
} }
BUG_ON(!sad->tclass || sad->tclass >= ARRAY_SIZE(secclass_map));
audit_log_format(ab, " tclass=%s", secclass_map[sad->tclass-1].name); audit_log_format(ab, " tclass=%s", secclass_map[sad->tclass-1].name);
if (sad->denied) if (sad->denied)
@ -748,6 +746,9 @@ noinline int slow_avc_audit(struct selinux_state *state,
struct common_audit_data stack_data; struct common_audit_data stack_data;
struct selinux_audit_data sad; struct selinux_audit_data sad;
if (WARN_ON(!tclass || tclass >= ARRAY_SIZE(secclass_map)))
return -EINVAL;
if (!a) { if (!a) {
a = &stack_data; a = &stack_data;
a->type = LSM_AUDIT_DATA_NONE; a->type = LSM_AUDIT_DATA_NONE;