aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-27 17:20:38 -0400
committerJames Morris <jmorris@namei.org>2010-04-28 08:51:12 +1000
commitcb84aa9b42b506299e5aea1ba4da26c03ab12877 (patch)
treeaf646c3d148f5c04f7362c8bddc59b8518cafd9e /security
parentb03df87d119f50715891dcc09e487f6ae5c029f1 (diff)
downloadmrst-s0i3-test-cb84aa9b42b506299e5aea1ba4da26c03ab12877.tar.gz
mrst-s0i3-test-cb84aa9b42b506299e5aea1ba4da26c03ab12877.tar.xz
mrst-s0i3-test-cb84aa9b42b506299e5aea1ba4da26c03ab12877.zip
LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE
Most of the LSM common audit work uses LSM_AUDIT_DATA_* for the naming. This was not so for LSM_AUDIT_NO_AUDIT which means the generic initializer cannot be used. This patch just renames the flag so the generic initializer can be used. Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/lsm_audit.c2
-rw-r--r--security/selinux/avc.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index acba3dfc8d2..8c3650672e2 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -220,7 +220,7 @@ static void dump_common_audit_data(struct audit_buffer *ab,
}
switch (a->type) {
- case LSM_AUDIT_NO_AUDIT:
+ case LSM_AUDIT_DATA_NONE:
return;
case LSM_AUDIT_DATA_IPC:
audit_log_format(ab, " key=%d ", a->u.ipc_id);
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 989fef82563..7f1a304712a 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -499,8 +499,7 @@ void avc_audit(u32 ssid, u32 tsid,
return;
if (!a) {
a = &stack_data;
- memset(a, 0, sizeof(*a));
- a->type = LSM_AUDIT_NO_AUDIT;
+ COMMON_AUDIT_DATA_INIT(a, NONE);
}
a->selinux_audit_data.tclass = tclass;
a->selinux_audit_data.requested = requested;