aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/audit.c
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 /kernel/audit.c
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>
Diffstat (limited to 'kernel/audit.c')
-rw-r--r--kernel/audit.c4
1 files changed, 1 insertions, 3 deletions
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 }