Skip to contentSkip to conversation

LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE

PATCH In review Eric Paris 2 participants 2 messages Apr 27, 2010

Subsystems (2)
SELinux security module Security (LSM)
lore
Share & tools
lore

Eric Paris

author
#0 lore raw

PATCH 1/1 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 no 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 <[email protected]>

---

 include/linux/lsm_audit.h |    2 +-
 security/lsm_audit.c      |    2 +-
 security/selinux/avc.c    |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
include/linux/lsm_audit.h +1 -1
index ce62294..c523eef 100644
@@ -33,7 +33,7 @@ struct common_audit_data {
 #define LSM_AUDIT_DATA_IPC	4
 #define LSM_AUDIT_DATA_TASK	5
 #define LSM_AUDIT_DATA_KEY	6
-#define LSM_AUDIT_NO_AUDIT	7
+#define LSM_AUDIT_DATA_NONE	7
 #define LSM_AUDIT_DATA_KMOD	8
 	struct task_struct *tsk;
 	union 	{
security/lsm_audit.c +1 -1
index 893365b..908aa71 100644
@@ -221,7 +221,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);
security/selinux/avc.c +1 -2
index 48b5fa4..466295b 100644
@@ -510,8 +510,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;
+		LSM_AUDIT_DATA_INIT(a, NONE);
 	}
 	a->selinux_audit_data.tclass = tclass;
 	a->selinux_audit_data.requested = requested;

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

#1 lore raw

self NACK old wrong patch! Sorry!

Quoted 55 lines · Eric Paris

Most of the LSM common audit work uses LSM_AUDIT_DATA_* for the naming. This was no 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 <[email protected]>

---

 include/linux/lsm_audit.h |    2 +-
 security/lsm_audit.c      |    2 +-
 security/selinux/avc.c    |    3 +--

 3 files changed, 3 insertions(+), 4 deletions(-)
include/linux/lsm_audit.h +1 -1
index ce62294..c523eef 100644
@@ -33,7 +33,7 @@ struct common_audit_data {
  #define LSM_AUDIT_DATA_IPC     4
  #define LSM_AUDIT_DATA_TASK    5
  #define LSM_AUDIT_DATA_KEY     6
-#define LSM_AUDIT_NO_AUDIT     7
+#define LSM_AUDIT_DATA_NONE    7
  #define LSM_AUDIT_DATA_KMOD    8
        struct task_struct *tsk;
        union   {
security/lsm_audit.c +1 -1
index 893365b..908aa71 100644
@@ -221,7 +221,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);

security/selinux/avc.c +1 -3
index 48b5fa4..466295b 100644
@@ -510,8 +510,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;
+               LSM_AUDIT_DATA_INIT(a, NONE);
        }
        a->selinux_audit_data.tclass = tclass;
        a->selinux_audit_data.requested = requested;
 
--
Quoted 4 lines

To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.