On Tue, 2010-04-27 at 17:20 -0400, Eric Paris wrote:
> Most of the LSM common audit work uses LSM_AUDIT_DATA_* for the naming.
> This was not so for LSM_AUDIT_NO_AUDIT which means the generic initializer
> cannot be used. This patch just renames the flag so the generic
> initializer can be used.
>
> Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
Acked-by: Stephen Smalley <sds@xxxxxxxxxxxxx>
> ---
>
> include/linux/lsm_audit.h | 2 +-
> security/lsm_audit.c | 2 +-
> security/selinux/avc.c | 3 +--
> 3 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
> index ce62294..c523eef 100644
> --- a/include/linux/lsm_audit.h
> +++ b/include/linux/lsm_audit.h
> @@ -33,7 +33,7 @@ struct common_audit_data {
> #define LSM_AUDIT_DATA_IPC 4
> #define LSM_AUDIT_DATA_TASK 5
> #define LSM_AUDIT_DATA_KEY 6
> -#define LSM_AUDIT_NO_AUDIT 7
> +#define LSM_AUDIT_DATA_NONE 7
> #define LSM_AUDIT_DATA_KMOD 8
> struct task_struct *tsk;
> union {
> diff --git a/security/lsm_audit.c b/security/lsm_audit.c
> index 893365b..908aa71 100644
> --- a/security/lsm_audit.c
> +++ b/security/lsm_audit.c
> @@ -221,7 +221,7 @@ static void dump_common_audit_data(struct audit_buffer *ab,
> }
>
> switch (a->type) {
> - case LSM_AUDIT_NO_AUDIT:
> + case LSM_AUDIT_DATA_NONE:
> return;
> case LSM_AUDIT_DATA_IPC:
> audit_log_format(ab, " key=%d ", a->u.ipc_id);
> diff --git a/security/selinux/avc.c b/security/selinux/avc.c
> index 48b5fa4..6371185 100644
> --- a/security/selinux/avc.c
> +++ b/security/selinux/avc.c
> @@ -510,8 +510,7 @@ void avc_audit(u32 ssid, u32 tsid,
> return;
> if (!a) {
> a = &stack_data;
> - memset(a, 0, sizeof(*a));
> - a->type = LSM_AUDIT_NO_AUDIT;
> + COMMON_AUDIT_DATA_INIT(a, NONE);
> }
> a->selinux_audit_data.tclass = tclass;
> a->selinux_audit_data.requested = requested;
>
>
> --
> This message was distributed to subscribers of the selinux mailing list.
> If you no longer wish to subscribe, send mail to majordomo@xxxxxxxxxxxxx with
> the words "unsubscribe selinux" without quotes as the message.
--
Stephen Smalley
National Security Agency
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@xxxxxxxxxxxxx with
the words "unsubscribe selinux" without quotes as the message.
