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

AppArmor: Fix dropping of allowed operations that are force audited

Browse Source 
The audit permission flag, that specifies an audit message should be
provided when an operation is allowed, was being ignored in some cases.

This is because the auto audit mode (which determines the audit mode from
system flags) was incorrectly assigned the same value as audit mode. The
shared value would result in messages that should be audited going through
a second evaluation as to whether they should be audited based on the
auto audit, resulting in some messages being dropped.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Kees Cook <kees@ubuntu.com>
This commit is contained in:
John Johansen 2012-02-22 00:20:26 -08:00
parent cdbd2884df
commit ade3ddc01e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
security/apparmor/audit.c
View File

@ -89,6 +89,7 @@ static char *aa_audit_type[] = {
"STATUS", "STATUS",
"ERROR", "ERROR",
"KILLED" "KILLED"
"AUTO"
}; };
/* /*

5
security/apparmor/include/audit.h
View File

@ -28,8 +28,6 @@ struct aa_profile;
extern const char *audit_mode_names[]; extern const char *audit_mode_names[];
#define AUDIT_MAX_INDEX 5 #define AUDIT_MAX_INDEX 5
#define AUDIT_APPARMOR_AUTO 0 /* auto choose audit message type */
enum audit_mode { enum audit_mode {
AUDIT_NORMAL, /* follow normal auditing of accesses */ AUDIT_NORMAL, /* follow normal auditing of accesses */
AUDIT_QUIET_DENIED, /* quiet all denied access messages */ AUDIT_QUIET_DENIED, /* quiet all denied access messages */
@ -45,7 +43,8 @@ enum audit_type {
AUDIT_APPARMOR_HINT, AUDIT_APPARMOR_HINT,
AUDIT_APPARMOR_STATUS, AUDIT_APPARMOR_STATUS,
AUDIT_APPARMOR_ERROR, AUDIT_APPARMOR_ERROR,
AUDIT_APPARMOR_KILL AUDIT_APPARMOR_KILL,
AUDIT_APPARMOR_AUTO
}; };
extern const char *op_table[]; extern const char *op_table[];