diff options
author | Thomas Liu <tliu@redhat.com> | 2009-07-09 10:00:30 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-07-09 18:58:39 -0400 |
commit | d4131ded4d4c1a5c1363ddd93ca104ed97dd0458 (patch) | |
tree | 137da0f52d5928eeb461218ac8109d22e65d579b /security/smack/smack_access.c | |
parent | ed5215a21460f63d6bdc118cb55a9e6d1b433f35 (diff) |
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/smack_access.c')
-rw-r--r-- | security/smack/smack_access.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c index dd84877dff30..0f9ac8146900 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) | |||
240 | static void smack_log_callback(struct audit_buffer *ab, void *a) | 240 | static void smack_log_callback(struct audit_buffer *ab, void *a) |
241 | { | 241 | { |
242 | struct common_audit_data *ad = a; | 242 | struct common_audit_data *ad = a; |
243 | struct smack_audit_data *sad = &ad->lsm_priv.smack_audit_data; | 243 | struct smack_audit_data *sad = &ad->smack_audit_data; |
244 | audit_log_format(ab, "lsm=SMACK fn=%s action=%s", | 244 | audit_log_format(ab, "lsm=SMACK fn=%s action=%s", |
245 | ad->lsm_priv.smack_audit_data.function, | 245 | ad->smack_audit_data.function, |
246 | sad->result ? "denied" : "granted"); | 246 | sad->result ? "denied" : "granted"); |
247 | audit_log_format(ab, " subject="); | 247 | audit_log_format(ab, " subject="); |
248 | audit_log_untrustedstring(ab, sad->subject); | 248 | audit_log_untrustedstring(ab, sad->subject); |
@@ -275,11 +275,11 @@ void smack_log(char *subject_label, char *object_label, int request, | |||
275 | if (result == 0 && (log_policy & SMACK_AUDIT_ACCEPT) == 0) | 275 | if (result == 0 && (log_policy & SMACK_AUDIT_ACCEPT) == 0) |
276 | return; | 276 | return; |
277 | 277 | ||
278 | if (a->lsm_priv.smack_audit_data.function == NULL) | 278 | if (a->smack_audit_data.function == NULL) |
279 | a->lsm_priv.smack_audit_data.function = "unknown"; | 279 | a->smack_audit_data.function = "unknown"; |
280 | 280 | ||
281 | /* end preparing the audit data */ | 281 | /* end preparing the audit data */ |
282 | sad = &a->lsm_priv.smack_audit_data; | 282 | sad = &a->smack_audit_data; |
283 | smack_str_from_perm(request_buffer, request); | 283 | smack_str_from_perm(request_buffer, request); |
284 | sad->subject = subject_label; | 284 | sad->subject = subject_label; |
285 | sad->object = object_label; | 285 | sad->object = object_label; |