iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Steve Grubb 2005-04-29 16:09:52 +01:00 committed by
parent 2fd6f58ba6
commit d812ddbb89
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/audit.h
View File

@ -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, extern int audit_receive_filter(int type, int pid, int uid, int seq,
void *data); void *data);
extern void audit_get_stamp(struct audit_context *ctx, 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 int audit_set_loginuid(struct audit_context *ctx, uid_t loginuid);
extern uid_t audit_get_loginuid(struct audit_context *ctx); 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); extern int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode);

6
kernel/audit.c
View File

@ -620,7 +620,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx)
struct audit_buffer *ab = NULL; struct audit_buffer *ab = NULL;
unsigned long flags; unsigned long flags;
struct timespec t; struct timespec t;
int serial = 0; unsigned int serial;
if (!audit_initialized) if (!audit_initialized)
return NULL; return NULL;
@ -669,8 +669,10 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx)
audit_get_stamp(ab->ctx, &t, &serial); audit_get_stamp(ab->ctx, &t, &serial);
else else
#endif #endif
{
t = CURRENT_TIME; t = CURRENT_TIME;
serial = 0;
}
audit_log_format(ab, "audit(%lu.%03lu:%u): ", audit_log_format(ab, "audit(%lu.%03lu:%u): ",
t.tv_sec, t.tv_nsec/1000000, serial); t.tv_sec, t.tv_nsec/1000000, serial);
return ab; return ab;

2
kernel/auditsc.c
View File

@ -992,7 +992,7 @@ void audit_inode(const char *name, const struct inode *inode)
} }
void audit_get_stamp(struct audit_context *ctx, void audit_get_stamp(struct audit_context *ctx,
struct timespec *t, int *serial) struct timespec *t, unsigned int *serial)
{ {
if (ctx) { if (ctx) {
t->tv_sec = ctx->ctime.tv_sec; t->tv_sec = ctx->ctime.tv_sec;