audit: convert sessionid unset to a macro

Use a macro, "AUDIT_SID_UNSET", to replace each instance of
initialization and comparison to an audit session ID.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/include/linux/audit.h b/include/linux/audit.h
index b639cf1f55ff6c16f9649fbc803cbb98c3cf6435..2d15bce7aa3c20a14db135d683050e381b63783b 100644 (file)
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -510,7 +510,7 @@ static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
 }
 static inline unsigned int audit_get_sessionid(struct task_struct *tsk)
 {
-       return -1;
+       return AUDIT_SID_UNSET;
 }
 static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp)
 { }

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index a872379b69da4e8e03a2b07d98f0ef4ce45cdcf7..fcce8eef6c7036349886c9651cf46b1fddb74fb1 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -751,7 +751,7 @@ static inline void xfrm_audit_helper_usrinfo(bool task_valid,
                                            audit_get_loginuid(current) :
                                            INVALID_UID);
        const unsigned int ses = task_valid ? audit_get_sessionid(current) :
-               (unsigned int) -1;
+               AUDIT_SID_UNSET;
 
        audit_log_format(audit_buf, " auid=%u ses=%u", auid, ses);
        audit_log_task_context(audit_buf);

diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
index 4e61a9e051325e1bf7a679af0d55ce73bfd652c8..04f9bd249094efdec6e58940613dcdd726e53d25 100644 (file)
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@ -465,6 +465,7 @@ struct audit_tty_status {
 };
 
 #define AUDIT_UID_UNSET (unsigned int)-1
+#define AUDIT_SID_UNSET ((unsigned int)-1)
 
 /* audit_rule_data supports filter rules with both integer and string
  * fields.  It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and

diff --git a/init/init_task.c b/init/init_task.c
index 3ac6e754cf644272bd51a790711c8ec50d3ef877..74f60baa2799dd95b14dfa03fb00bed8de33949d 100644 (file)
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -9,6 +9,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
+#include <linux/audit.h>
 
 #include <asm/pgtable.h>
 #include <linux/uaccess.h>
@@ -119,7 +120,7 @@ struct task_struct init_task
        .thread_node    = LIST_HEAD_INIT(init_signals.thread_head),
 #ifdef CONFIG_AUDITSYSCALL
        .loginuid       = INVALID_UID,
-       .sessionid      = (unsigned int)-1,
+       .sessionid      = AUDIT_SID_UNSET,
 #endif
 #ifdef CONFIG_PERF_EVENTS
        .perf_event_mutex = __MUTEX_INITIALIZER(init_task.perf_event_mutex),

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 0d4e7ab847b1dff0d04464a56879d5149065ed6e..378c45b927757be96afce9b7e0df654044c12741 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2050,7 +2050,7 @@ static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid,
 int audit_set_loginuid(kuid_t loginuid)
 {
        struct task_struct *task = current;
-       unsigned int oldsessionid, sessionid = (unsigned int)-1;
+       unsigned int oldsessionid, sessionid = AUDIT_SID_UNSET;
        kuid_t oldloginuid;
        int rc;
 
@@ -2064,7 +2064,7 @@ int audit_set_loginuid(kuid_t loginuid)
        /* are we setting or clearing? */
        if (uid_valid(loginuid)) {
                sessionid = (unsigned int)atomic_inc_return(&session_id);
-               if (unlikely(sessionid == (unsigned int)-1))
+               if (unlikely(sessionid == AUDIT_SID_UNSET))
                        sessionid = (unsigned int)atomic_inc_return(&session_id);
        }