diff options
author | Steve Grubb <sgrubb@redhat.com> | 2005-04-29 11:09:52 -0400 |
---|---|---|
committer | <dwmw2@shinybook.infradead.org> | 2005-04-29 11:09:52 -0400 |
commit | d812ddbb89e323d054a7d073466225966c8350c8 (patch) | |
tree | 469e3e7bb7d1ca450059fc1b45660b8bc6452dc7 /kernel | |
parent | 2fd6f58ba6efc82ea2c9c2630f7ff5ed9eeaf34a (diff) |
[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>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/audit.c | 6 | ||||
-rw-r--r-- | kernel/auditsc.c | 2 |
2 files changed, 5 insertions, 3 deletions
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) | |||
620 | struct audit_buffer *ab = NULL; | 620 | struct audit_buffer *ab = NULL; |
621 | unsigned long flags; | 621 | unsigned long flags; |
622 | struct timespec t; | 622 | struct timespec t; |
623 | int serial = 0; | 623 | unsigned int serial; |
624 | 624 | ||
625 | if (!audit_initialized) | 625 | if (!audit_initialized) |
626 | return NULL; | 626 | return NULL; |
@@ -669,8 +669,10 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx) | |||
669 | audit_get_stamp(ab->ctx, &t, &serial); | 669 | audit_get_stamp(ab->ctx, &t, &serial); |
670 | else | 670 | else |
671 | #endif | 671 | #endif |
672 | { | ||
672 | t = CURRENT_TIME; | 673 | t = CURRENT_TIME; |
673 | 674 | serial = 0; | |
675 | } | ||
674 | audit_log_format(ab, "audit(%lu.%03lu:%u): ", | 676 | audit_log_format(ab, "audit(%lu.%03lu:%u): ", |
675 | t.tv_sec, t.tv_nsec/1000000, serial); | 677 | t.tv_sec, t.tv_nsec/1000000, serial); |
676 | return ab; | 678 | 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) | |||
992 | } | 992 | } |
993 | 993 | ||
994 | void audit_get_stamp(struct audit_context *ctx, | 994 | void audit_get_stamp(struct audit_context *ctx, |
995 | struct timespec *t, int *serial) | 995 | struct timespec *t, unsigned int *serial) |
996 | { | 996 | { |
997 | if (ctx) { | 997 | if (ctx) { |
998 | t->tv_sec = ctx->ctime.tv_sec; | 998 | t->tv_sec = ctx->ctime.tv_sec; |