diff options
| author | Thomas Liu <tliu@redhat.com> | 2009-07-09 10:00:30 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-10 08:58:39 +1000 |
| commit | d4131ded4d4c1a5c1363ddd93ca104ed97dd0458 (patch) | |
| tree | 137da0f52d5928eeb461218ac8109d22e65d579b /security/smack | |
| parent | ed5215a21460f63d6bdc118cb55a9e6d1b433f35 (diff) | |
| download | kernel_samsung_espresso10-d4131ded4d4c1a5c1363ddd93ca104ed97dd0458.zip kernel_samsung_espresso10-d4131ded4d4c1a5c1363ddd93ca104ed97dd0458.tar.gz kernel_samsung_espresso10-d4131ded4d4c1a5c1363ddd93ca104ed97dd0458.tar.bz2 | |
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>
Diffstat (limited to 'security/smack')
| -rw-r--r-- | security/smack/smack.h | 2 | ||||
| -rw-r--r-- | security/smack/smack_access.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h index ff180ed..c6e9aca 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h @@ -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, diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c index dd84877..0f9ac81 100644 --- a/security/smack/smack_access.c +++ b/security/smack/smack_access.c @@ -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; |