security: Make lsm_priv union in lsm_audit.h anonymous
Made the lsm_priv union in include/linux/lsm_audit.h anonymous. Signed-off-by: Thomas Liu <tliu@redhat.com> Acked-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
parent
ed5215a214
commit
d4131ded4d
|
@ -86,7 +86,7 @@ struct common_audit_data {
|
|||
struct av_decision *avd;
|
||||
int result;
|
||||
} selinux_audit_data;
|
||||
} lsm_priv;
|
||||
};
|
||||
/* these callback will be implemented by a specific LSM */
|
||||
void (*lsm_pre_audit)(struct audit_buffer *, void *);
|
||||
void (*lsm_post_audit)(struct audit_buffer *, void *);
|
||||
|
|
|
@ -275,7 +275,7 @@ static inline void smk_ad_init(struct smk_audit_info *a, const char *func,
|
|||
{
|
||||
memset(a, 0, sizeof(*a));
|
||||
a->a.type = type;
|
||||
a->a.lsm_priv.smack_audit_data.function = func;
|
||||
a->a.smack_audit_data.function = func;
|
||||
}
|
||||
|
||||
static inline void smk_ad_setfield_u_tsk(struct smk_audit_info *a,
|
||||
|
|
|
@ -240,9 +240,9 @@ static inline void smack_str_from_perm(char *string, int access)
|
|||
static void smack_log_callback(struct audit_buffer *ab, void *a)
|
||||
{
|
||||
struct common_audit_data *ad = a;
|
||||
struct smack_audit_data *sad = &ad->lsm_priv.smack_audit_data;
|
||||
struct smack_audit_data *sad = &ad->smack_audit_data;
|
||||
audit_log_format(ab, "lsm=SMACK fn=%s action=%s",
|
||||
ad->lsm_priv.smack_audit_data.function,
|
||||
ad->smack_audit_data.function,
|
||||
sad->result ? "denied" : "granted");
|
||||
audit_log_format(ab, " subject=");
|
||||
audit_log_untrustedstring(ab, sad->subject);
|
||||
|
@ -275,11 +275,11 @@ void smack_log(char *subject_label, char *object_label, int request,
|
|||
if (result == 0 && (log_policy & SMACK_AUDIT_ACCEPT) == 0)
|
||||
return;
|
||||
|
||||
if (a->lsm_priv.smack_audit_data.function == NULL)
|
||||
a->lsm_priv.smack_audit_data.function = "unknown";
|
||||
if (a->smack_audit_data.function == NULL)
|
||||
a->smack_audit_data.function = "unknown";
|
||||
|
||||
/* end preparing the audit data */
|
||||
sad = &a->lsm_priv.smack_audit_data;
|
||||
sad = &a->smack_audit_data;
|
||||
smack_str_from_perm(request_buffer, request);
|
||||
sad->subject = subject_label;
|
||||
sad->object = object_label;
|
||||
|
|
Loading…
Reference in a new issue