[AUDIT] Fix signedness of 'serial' in various routines.

Attached is a patch that corrects a signed/unsigned warning. I also noticed
that we needlessly init serial to 0. That only needs to occur if the kernel
was compiled without the audit system.

-Steve Grubb

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

3 files changed, 6 insertions, 4 deletions

diff --git a/include/linux/audit.h b/include/linux/audit.h
index fad0c1dc21a9..0467f2441b68 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -186,7 +186,7 @@ extern void audit_inode(const char *name, const struct inode *inode);
 extern int  audit_receive_filter(int type, int pid, int uid, int seq,
                                  void *data);
 extern void audit_get_stamp(struct audit_context *ctx,
-                            struct timespec *t, int *serial);
+                            struct timespec *t, unsigned int *serial);
 extern int  audit_set_loginuid(struct audit_context *ctx, uid_t loginuid);
 extern uid_t audit_get_loginuid(struct audit_context *ctx);
 extern int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode);
diff --git a/kernel/audit.c b/kernel/audit.c
index e7bff8000d23..aa35422c0c42 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -620,7 +620,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx)
         struct audit_buffer     *ab     = NULL;
         unsigned long           flags;
         struct timespec         t;
-        int                     serial  = 0;
+        unsigned int            serial;
 
         if (!audit_initialized)
                 return NULL;
@@ -669,8 +669,10 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx)
                 audit_get_stamp(ab->ctx, &t, &serial);
         else
 #endif
+        {
                 t = CURRENT_TIME;
-
+                serial = 0;
+        }
         audit_log_format(ab, "audit(%lu.%03lu:%u): ",
                          t.tv_sec, t.tv_nsec/1000000, serial);
         return ab;
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 77e92592de57..49ecd707b953 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -992,7 +992,7 @@ void audit_inode(const char *name, const struct inode *inode)
 }
 
 void audit_get_stamp(struct audit_context *ctx,
-                     struct timespec *t, int *serial)
+                     struct timespec *t, unsigned int *serial)
 {
         if (ctx) {
                 t->tv_sec  = ctx->ctime.tv_sec;