diff options
| author | Thomas Liu <tliu@redhat.com> | 2009-07-09 10:00:31 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-10 08:59:46 +1000 |
| commit | 65c3f0a2d0f72d210c879e4974c2d222b7951321 (patch) | |
| tree | 0eb6b33647aeb8d170a1d5ee2841b3595142c452 | |
| parent | d4131ded4d4c1a5c1363ddd93ca104ed97dd0458 (diff) | |
| download | linux-stable-65c3f0a2d0f72d210c879e4974c2d222b7951321.tar.gz linux-stable-65c3f0a2d0f72d210c879e4974c2d222b7951321.tar.bz2 linux-stable-65c3f0a2d0f72d210c879e4974c2d222b7951321.zip | |
security: Wrap SMACK and SELINUX audit data structs in ifdefs
Wrapped the smack_audit_data and selinux_audit_data
structs in include/linux/lsm_audit.h in ifdefs so that the
union will always be the correct size.
Signed-off-by: Thomas Liu <tliu@redhat.com>
Acked-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | include/linux/lsm_audit.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h index 40d1b84f2a3c..a5514a3a4f17 100644 --- a/include/linux/lsm_audit.h +++ b/include/linux/lsm_audit.h @@ -68,6 +68,7 @@ struct common_audit_data { } u; /* this union contains LSM specific data */ union { +#ifdef CONFIG_SECURITY_SMACK /* SMACK data */ struct smack_audit_data { const char *function; @@ -76,6 +77,8 @@ struct common_audit_data { char *request; int result; } smack_audit_data; +#endif +#ifdef CONFIG_SECURITY_SELINUX /* SELinux data */ struct { u32 ssid; @@ -86,6 +89,7 @@ struct common_audit_data { struct av_decision *avd; int result; } selinux_audit_data; +#endif }; /* these callback will be implemented by a specific LSM */ void (*lsm_pre_audit)(struct audit_buffer *, void *); |