UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Thomas Liu 2009-07-09 10:00:30 -04:00 committed by James Morris
parent ed5215a214
commit d4131ded4d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/lsm_audit.h
View File

@ -86,7 +86,7 @@ struct common_audit_data {
struct av_decision *avd; struct av_decision *avd;
int result; int result;
} selinux_audit_data; } selinux_audit_data;
} lsm_priv; };
/* these callback will be implemented by a specific LSM */ /* these callback will be implemented by a specific LSM */
void (*lsm_pre_audit)(struct audit_buffer *, void *); void (*lsm_pre_audit)(struct audit_buffer *, void *);
void (*lsm_post_audit)(struct audit_buffer *, void *); void (*lsm_post_audit)(struct audit_buffer *, void *);

2
security/smack/smack.h
View File

@ -275,7 +275,7 @@ static inline void smk_ad_init(struct smk_audit_info *a, const char *func,
{ {
memset(a, 0, sizeof(*a)); memset(a, 0, sizeof(*a));
a->a.type = type; 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, static inline void smk_ad_setfield_u_tsk(struct smk_audit_info *a,

10
security/smack/smack_access.c
View File

@ -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) static void smack_log_callback(struct audit_buffer *ab, void *a)
{ {
struct common_audit_data *ad = 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", 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"); sad->result ? "denied" : "granted");
audit_log_format(ab, " subject="); audit_log_format(ab, " subject=");
audit_log_untrustedstring(ab, sad->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) if (result == 0 && (log_policy & SMACK_AUDIT_ACCEPT) == 0)
return; return;
if (a->lsm_priv.smack_audit_data.function == NULL) if (a->smack_audit_data.function == NULL)
a->lsm_priv.smack_audit_data.function = "unknown"; a->smack_audit_data.function = "unknown";
/* end preparing the audit data */ /* end preparing the audit data */
sad = &a->lsm_priv.smack_audit_data; sad = &a->smack_audit_data;
smack_str_from_perm(request_buffer, request); smack_str_from_perm(request_buffer, request);
sad->subject = subject_label; sad->subject = subject_label;
sad->object = object_label; sad->object = object_label;