summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorThomas Liu <tliu@redhat.com>2009-07-09 10:00:29 -0400
committerJames Morris <jmorris@namei.org>2009-07-10 08:54:14 +1000
commited5215a21460f63d6bdc118cb55a9e6d1b433f35 (patch)
tree8134723eb6a5d73162a7e5d9c11ac66440f11b82 /security
parentac7242142b03421c96b0a2f8d99f146d075614c2 (diff)
downloadlinux-ed5215a21460f63d6bdc118cb55a9e6d1b433f35.tar.bz2
Move variable function in lsm_audit.h into SMACK private space
Moved variable function in include/linux/lsm_audit.h into the smack_audit_data struct since it is never used outside of it. Also removed setting of function in the COMMON_AUDIT_DATA_INIT macro because that variable is now private to SMACK. Signed-off-by: Thomas Liu <tliu@redhat.com> Acked-by: Eric Paris <eparis@redhat.com> I-dont-see-any-problems-with-it: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/smack/smack.h2
-rw-r--r--security/smack/smack_access.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h
index 243bec175be0..ff180ede3e47 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.function = func;
+ a->a.lsm_priv.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 513dc1aa16dd..dd84877dff30 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -241,7 +241,8 @@ 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;
- audit_log_format(ab, "lsm=SMACK fn=%s action=%s", ad->function,
+ audit_log_format(ab, "lsm=SMACK fn=%s action=%s",
+ ad->lsm_priv.smack_audit_data.function,
sad->result ? "denied" : "granted");
audit_log_format(ab, " subject=");
audit_log_untrustedstring(ab, sad->subject);
@@ -274,8 +275,8 @@ void smack_log(char *subject_label, char *object_label, int request,
if (result == 0 && (log_policy & SMACK_AUDIT_ACCEPT) == 0)
return;
- if (a->function == NULL)
- a->function = "unknown";
+ if (a->lsm_priv.smack_audit_data.function == NULL)
+ a->lsm_priv.smack_audit_data.function = "unknown";
/* end preparing the audit data */
sad = &a->lsm_priv.smack_audit_data;