diff options
| author | John Johansen <john.johansen@canonical.com> | 2010-07-23 04:57:23 -0700 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-09-02 13:46:58 -0700 |
| commit | 4daef5ef9f714aa11e884bbd14baf177b90bf5ad (patch) | |
| tree | 71b3e10b1062e5ae7a529a4634a3bb1058cd2f97 /include | |
| parent | e8f0f50c93c0007cbe258fca62a1d5036d70df6f (diff) | |
UBUNTU: SAUCE: AppArmor: -- sync to AppArmor mainline 2010-07-27
Sync AppArmor mainline upstreaming version 2010-06-27
contains fixes for
BugLink: http://bugs.launchpad.net/bugs/599450
BugLink: http://bugs.launchpad.net/bugs/581525
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/lsm_audit.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h index ec02ec1cb34..13b5c9a4d30 100644 --- a/include/linux/lsm_audit.h +++ b/include/linux/lsm_audit.h @@ -23,6 +23,7 @@ #include <linux/skbuff.h> #include <asm/system.h> + /* Auxiliary data to use in generating the audit record. */ struct common_audit_data { char type; @@ -103,7 +104,7 @@ struct common_audit_data { const char *info; union { void *target; - struct { + struct { long pos; void *target; } iface; @@ -112,16 +113,11 @@ struct common_audit_data { unsigned long max; } rlim; struct { - const char *path; const char *target; - u16 request; - u16 denied; + u32 request; + u32 denied; uid_t ouid; } fs; - struct { - int type, protocol; - struct sock *sk; - } net; }; } apparmor_audit_data; #endif |