UBUNTU: SAUCE: apparmor4.0.0 [22/90]: LSM stacking v39: Audit: Create audit_stamp structure
BugLink: http://bugs.launchpad.net/bugs/2028253 Replace the timestamp and serial number pair used in audit records with a structure containing the two elements. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Acked-by: Paul Moore <paul@paul-moore.com> (cherry picked from commit d53c83c9c429e3cdcbfd0820b4c3617ece5ace0a https://git.launchpad.net/~apparmor-dev/ubuntu-kernel-next) Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
committed by
Paolo Pisati
parent
81359c5d18
commit
341c97efe3
+9
-4
@@ -99,6 +99,12 @@ struct audit_proctitle {
|
||||
char *value; /* the cmdline field */
|
||||
};
|
||||
|
||||
/* A timestamp/serial pair to identify an event */
|
||||
struct audit_stamp {
|
||||
struct timespec64 ctime; /* time of syscall entry */
|
||||
unsigned int serial; /* serial number for record */
|
||||
};
|
||||
|
||||
/* The per-task audit context. */
|
||||
struct audit_context {
|
||||
int dummy; /* must be the first element */
|
||||
@@ -108,10 +114,9 @@ struct audit_context {
|
||||
AUDIT_CTX_URING, /* in use by io_uring */
|
||||
} context;
|
||||
enum audit_state state, current_state;
|
||||
unsigned int serial; /* serial number for record */
|
||||
struct audit_stamp stamp; /* event identifier */
|
||||
int major; /* syscall number */
|
||||
int uring_op; /* uring operation */
|
||||
struct timespec64 ctime; /* time of syscall entry */
|
||||
unsigned long argv[4]; /* syscall arguments */
|
||||
long return_code;/* syscall return code */
|
||||
u64 prio;
|
||||
@@ -263,7 +268,7 @@ extern void audit_put_tty(struct tty_struct *tty);
|
||||
extern unsigned int audit_serial(void);
|
||||
#ifdef CONFIG_AUDITSYSCALL
|
||||
extern int auditsc_get_stamp(struct audit_context *ctx,
|
||||
struct timespec64 *t, unsigned int *serial);
|
||||
struct audit_stamp *stamp);
|
||||
|
||||
extern void audit_put_watch(struct audit_watch *watch);
|
||||
extern void audit_get_watch(struct audit_watch *watch);
|
||||
@@ -304,7 +309,7 @@ extern void audit_filter_inodes(struct task_struct *tsk,
|
||||
struct audit_context *ctx);
|
||||
extern struct list_head *audit_killed_trees(void);
|
||||
#else /* CONFIG_AUDITSYSCALL */
|
||||
#define auditsc_get_stamp(c, t, s) 0
|
||||
#define auditsc_get_stamp(c, s) 0
|
||||
#define audit_put_watch(w) do { } while (0)
|
||||
#define audit_get_watch(w) do { } while (0)
|
||||
#define audit_to_watch(k, p, l, o) (-EINVAL)
|
||||
|
||||
Reference in New Issue
Block a user