Move variable function in lsm_audit.h into SMACK private space
Subsystems (3)
PATCH 1/3 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.
---
include/linux/lsm_audit.h | 4 ++-- security/smack/smack.h | 2 +- security/smack/smack_access.c | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-)
include/linux/lsm_audit.h +2 -2
@@ -66,11 +66,11 @@ struct common_audit_data { } key_struct;#endif } u; -const char *function;/* this union contains LSM specific data */ union {/* SMACK data */ struct smack_audit_data { +const char *function;char *subject;char *object;char *request;
@@ -104,7 +104,7 @@ int ipv6_skb_to_auditdata(struct sk_buff *skb,/* Initialize an LSM audit data structure. */ #define COMMON_AUDIT_DATA_INIT (_d, _t) \ { memset((_d), 0, sizeof(struct common_audit_data)); \ - (_d)->type = LSM_AUDIT_DATA_##_t; (_d)->function = __func__; } + (_d)->type = LSM_AUDIT_DATA_##_t; }void common_lsm_audit (struct common_audit_data *a);
security/smack/smack.h +1 -1
@@ -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,
security/smack/smack_access.c +4 -3
@@ -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;
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 7 lines · Thomas Liu
Moved variable function in
include/linux/lsm_audit.hinto thesmack_audit_datastruct since it is never used outside of it.Also removed setting of function in the
COMMON_AUDIT_DATA_INITmacro because that variable is now private to SMACK.Signed-off-by Thomas Liu <[email protected]>
Quoted 64 lines
---
include/linux/lsm_audit.h | 4 ++-- security/smack/smack.h | 2 +- security/smack/smack_access.c | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-)include/linux/lsm_audit.h +2
-2@@ -66,11 +66,11 @@ struct common_audit_data { } key_struct;#endif } u; -const char *function;/* this union contains LSM specific data */ union {/* SMACK data */ struct smack_audit_data { +const char *function;char *subject;char *object;char *request;@@ -104,7 +104,7 @@ int ipv6_skb_to_auditdata(struct sk_buff *skb,/* Initialize an LSM audit data structure. */ #define COMMON_AUDIT_DATA_INIT (_d, _t) \ { memset((_d), 0, sizeof(struct common_audit_data)); \ - (_d)->type = LSM_AUDIT_DATA_##_t; (_d)->function = __func__; } + (_d)->type = LSM_AUDIT_DATA_##_t; }void common_lsm_audit (struct common_audit_data *a);security/smack/smack.h +1
-1@@ -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,security/smack/smack_access.c +2
-1@@ -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);
security/smack/smack_access.c void smack_log(char *subject_label, char *object_label, int request, · line 282
Quoted 10 lines
security/smack/smack_access.c +2
-2@@ -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;
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Casey Schaufler
maintainerQuoted 3 lines · Thomas Liu
Moved variable function in
include/linux/lsm_audit.hinto thesmack_audit_datastruct since it is never used outside of it.
What value does this change provide?
Quoted 70 lines
Also removed setting of function in the
COMMON_AUDIT_DATA_INITmacro because that variable is now private to SMACK.Signed-off-by Thomas Liu <[email protected]>---
include/linux/lsm_audit.h | 4 ++-- security/smack/smack.h | 2 +- security/smack/smack_access.c | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-)include/linux/lsm_audit.h +2
-2@@ -66,11 +66,11 @@ struct common_audit_data { } key_struct;#endif } u; -const char *function;/* this union contains LSM specific data */ union {/* SMACK data */ struct smack_audit_data { +const char *function;char *subject;char *object;char *request;@@ -104,7 +104,7 @@ int ipv6_skb_to_auditdata(struct sk_buff *skb,/* Initialize an LSM audit data structure. */ #define COMMON_AUDIT_DATA_INIT (_d, _t) \ { memset((_d), 0, sizeof(struct common_audit_data)); \ - (_d)->type = LSM_AUDIT_DATA_##_t; (_d)->function = __func__; } + (_d)->type = LSM_AUDIT_DATA_##_t; }void common_lsm_audit (struct common_audit_data *a);security/smack/smack.h +1
-1@@ -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,security/smack/smack_access.c +2
-1@@ -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);
security/smack/smack_access.c void smack_log(char *subject_label, char *object_label, int request, · line 282
Quoted 10 lines
security/smack/smack_access.c +2
-2@@ -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;
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 6 lines · Casey Schaufler
Quoted 3 lines · Thomas Liu
Moved variable function in
include/linux/lsm_audit.hinto thesmack_audit_datastruct since it is never used outside of it.What value does this change provide?
By itself, none other than proper abstracting. ->function is a smack specific object so it shouldn't be in the generic space. Along with patch #3 it saves memory on systems that choose to build without SMACK.
-Eric
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Casey Schaufler
maintainerQuoted 8 lines · Eric Paris
Quoted 6 lines · Casey Schaufler
Quoted 4 lines · Thomas Liu
Moved variable function in
include/linux/lsm_audit.hinto thesmack_audit_datastruct since it is never used outside of it.
Quoted 7 lines
Quoted 2 lines
What value does this change provide?
By itself, none other than proper abstracting. ->function is a smack specific object so it shouldn't be in the generic space. Along with patch #3 it saves memory on systems that choose to build without SMACK.
I don't see any problems with it then.
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
James Morris
maintainerQuoted 7 lines · Thomas Liu
Moved variable function in
include/linux/lsm_audit.hinto thesmack_audit_datastruct since it is never used outside of it.Also removed setting of function in the
COMMON_AUDIT_DATA_INITmacro because that variable is now private to SMACK.Signed-off-by Thomas Liu <[email protected]>
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
Signature · 7 lines
James Morris <[email protected]> -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.