diff options
author | Amy Griffis <amy.griffis@hp.com> | 2006-02-07 12:05:27 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-03-20 14:08:54 -0500 |
commit | 93315ed6dd12dacfc941f9eb8ca0293aadf99793 (patch) | |
tree | 4fc070c92a1de21d3befe4ce48c733c65d044bb3 /kernel/audit.h | |
parent | af601e4623d0303bfafa54ec728b7ae8493a8e1b (diff) |
[PATCH] audit string fields interface + consumer
Updated patch to dynamically allocate audit rule fields in kernel's
internal representation. Added unlikely() calls for testing memory
allocation result.
Amy Griffis wrote: [Wed Jan 11 2006, 02:02:31PM EST]
> Modify audit's kernel-userspace interface to allow the specification
> of string fields in audit rules.
>
> Signed-off-by: Amy Griffis <amy.griffis@hp.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from 5ffc4a863f92351b720fe3e9c5cd647accff9e03 commit)
Diffstat (limited to 'kernel/audit.h')
-rw-r--r-- | kernel/audit.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/kernel/audit.h b/kernel/audit.h index 7643e46daeb2..4b602cdcabef 100644 --- a/kernel/audit.h +++ b/kernel/audit.h | |||
@@ -52,10 +52,27 @@ enum audit_state { | |||
52 | }; | 52 | }; |
53 | 53 | ||
54 | /* Rule lists */ | 54 | /* Rule lists */ |
55 | struct audit_field { | ||
56 | u32 type; | ||
57 | u32 val; | ||
58 | u32 op; | ||
59 | }; | ||
60 | |||
61 | struct audit_krule { | ||
62 | int vers_ops; | ||
63 | u32 flags; | ||
64 | u32 listnr; | ||
65 | u32 action; | ||
66 | u32 mask[AUDIT_BITMASK_SIZE]; | ||
67 | u32 buflen; /* for data alloc on list rules */ | ||
68 | u32 field_count; | ||
69 | struct audit_field *fields; | ||
70 | }; | ||
71 | |||
55 | struct audit_entry { | 72 | struct audit_entry { |
56 | struct list_head list; | 73 | struct list_head list; |
57 | struct rcu_head rcu; | 74 | struct rcu_head rcu; |
58 | struct audit_rule rule; | 75 | struct audit_krule rule; |
59 | }; | 76 | }; |
60 | 77 | ||
61 | 78 | ||