projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
kernel
/
audit.c
diff --git
a/kernel/audit.c
b/kernel/audit.c
index
68cee3b
..
1ffc2e0
100644
(file)
--- a/
kernel/audit.c
+++ b/
kernel/audit.c
@@
-67,7
+67,7
@@
#define AUDIT_DISABLED -1
#define AUDIT_UNINITIALIZED 0
#define AUDIT_INITIALIZED 1
#define AUDIT_DISABLED -1
#define AUDIT_UNINITIALIZED 0
#define AUDIT_INITIALIZED 1
-static int audit_initialized;
+static int audit_initialized
= AUDIT_UNINITIALIZED
;
u32 audit_enabled = AUDIT_OFF;
bool audit_ever_enabled = !!AUDIT_OFF;
u32 audit_enabled = AUDIT_OFF;
bool audit_ever_enabled = !!AUDIT_OFF;
@@
-523,7
+523,7
@@
static int auditd_set(struct pid *pid, u32 portid, struct net *net)
}
/**
}
/**
- * kauditd_print_skb - Print the audit record to the ring buffer
+ * kauditd_print
k
_skb - Print the audit record to the ring buffer
* @skb: audit record
*
* Whatever the reason, this packet may not make it to the auditd connection
* @skb: audit record
*
* Whatever the reason, this packet may not make it to the auditd connection
@@
-1779,7
+1779,7
@@
unsigned int audit_serial(void)
{
static atomic_t serial = ATOMIC_INIT(0);
{
static atomic_t serial = ATOMIC_INIT(0);
- return atomic_
add_return(1,
&serial);
+ return atomic_
inc_return(
&serial);
}
static inline void audit_get_stamp(struct audit_context *ctx,
}
static inline void audit_get_stamp(struct audit_context *ctx,
@@
-1865,6
+1865,9
@@
struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
}
audit_get_stamp(ab->ctx, &t, &serial);
}
audit_get_stamp(ab->ctx, &t, &serial);
+ /* cancel dummy context to enable supporting records */
+ if (ctx)
+ ctx->dummy = 0;
audit_log_format(ab, "audit(%llu.%03lu:%u): ",
(unsigned long long)t.tv_sec, t.tv_nsec/1000000, serial);
audit_log_format(ab, "audit(%llu.%03lu:%u): ",
(unsigned long long)t.tv_sec, t.tv_nsec/1000000, serial);