aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-12-06 01:05:50 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2008-12-09 02:27:41 -0500
commit48887e63d6e057543067327da6b091297f7fe645 (patch)
treef290af5a887bcf840a63043eb2df3a4c02ccaea3
parent7f0ed77d241b60f70136f15b8eef30a3de1fa249 (diff)
[PATCH] fix broken timestamps in AVC generated by kernel threads
Timestamp in audit_context is valid only if ->in_syscall is set. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--include/linux/audit.h4
-rw-r--r--kernel/audit.c4
-rw-r--r--kernel/auditsc.c5
3 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 1b2a6a5c1876..8f0672d13eb1 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -435,7 +435,7 @@ static inline void audit_ptrace(struct task_struct *t)
435 435
436 /* Private API (for audit.c only) */ 436 /* Private API (for audit.c only) */
437extern unsigned int audit_serial(void); 437extern unsigned int audit_serial(void);
438extern void auditsc_get_stamp(struct audit_context *ctx, 438extern int auditsc_get_stamp(struct audit_context *ctx,
439 struct timespec *t, unsigned int *serial); 439 struct timespec *t, unsigned int *serial);
440extern int audit_set_loginuid(struct task_struct *task, uid_t loginuid); 440extern int audit_set_loginuid(struct task_struct *task, uid_t loginuid);
441#define audit_get_loginuid(t) ((t)->loginuid) 441#define audit_get_loginuid(t) ((t)->loginuid)
@@ -518,7 +518,7 @@ extern int audit_signals;
518#define audit_inode(n,d) do { ; } while (0) 518#define audit_inode(n,d) do { ; } while (0)
519#define audit_inode_child(d,i,p) do { ; } while (0) 519#define audit_inode_child(d,i,p) do { ; } while (0)
520#define audit_core_dumps(i) do { ; } while (0) 520#define audit_core_dumps(i) do { ; } while (0)
521#define auditsc_get_stamp(c,t,s) do { BUG(); } while (0) 521#define auditsc_get_stamp(c,t,s) (0)
522#define audit_get_loginuid(t) (-1) 522#define audit_get_loginuid(t) (-1)
523#define audit_get_sessionid(t) (-1) 523#define audit_get_sessionid(t) (-1)
524#define audit_log_task_context(b) do { ; } while (0) 524#define audit_log_task_context(b) do { ; } while (0)
diff --git a/kernel/audit.c b/kernel/audit.c
index d8646c23b427..ce6d8ea3131e 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1121,9 +1121,7 @@ unsigned int audit_serial(void)
1121static inline void audit_get_stamp(struct audit_context *ctx, 1121static inline void audit_get_stamp(struct audit_context *ctx,
1122 struct timespec *t, unsigned int *serial) 1122 struct timespec *t, unsigned int *serial)
1123{ 1123{
1124 if (ctx) 1124 if (!ctx || !auditsc_get_stamp(ctx, t, serial)) {
1125 auditsc_get_stamp(ctx, t, serial);
1126 else {
1127 *t = CURRENT_TIME; 1125 *t = CURRENT_TIME;
1128 *serial = audit_serial(); 1126 *serial = audit_serial();
1129 } 1127 }
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 0a13d6895494..2a3f0afc4d2a 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1957,15 +1957,18 @@ EXPORT_SYMBOL_GPL(__audit_inode_child);
1957 * 1957 *
1958 * Also sets the context as auditable. 1958 * Also sets the context as auditable.
1959 */ 1959 */
1960void auditsc_get_stamp(struct audit_context *ctx, 1960int auditsc_get_stamp(struct audit_context *ctx,
1961 struct timespec *t, unsigned int *serial) 1961 struct timespec *t, unsigned int *serial)
1962{ 1962{
1963 if (!ctx->in_syscall)
1964 return 0;
1963 if (!ctx->serial) 1965 if (!ctx->serial)
1964 ctx->serial = audit_serial(); 1966 ctx->serial = audit_serial();
1965 t->tv_sec = ctx->ctime.tv_sec; 1967 t->tv_sec = ctx->ctime.tv_sec;
1966 t->tv_nsec = ctx->ctime.tv_nsec; 1968 t->tv_nsec = ctx->ctime.tv_nsec;
1967 *serial = ctx->serial; 1969 *serial = ctx->serial;
1968 ctx->auditable = 1; 1970 ctx->auditable = 1;
1971 return 1;
1969} 1972}
1970 1973
1971/* global counter which is incremented every time something logs in */ 1974/* global counter which is incremented every time something logs in */