audit: convert all sessionid declaration to unsigned int
Subsystems (5)
Eric Paris
maintainerPATCH 1/1 audit: convert all sessionid declaration to unsigned int
Right now the sessionid value in the kernel is a combination of u32, int, and unsigned int. Just use unsigned int throughout.
Signed-off-by Eric Paris <[email protected]>
--- drivers/tty/tty_audit.c | 2 +- include/linux/audit.h | 2 +- include/linux/init_task.h | 2 +- include/net/netlabel.h | 2 +- include/net/xfrm.h | 2 +- kernel/audit.c | 2 +- kernel/auditfilter.c | 2 +- kernel/auditsc.c | 2 +- net/xfrm/xfrm_policy.c | 8 ++++---- net/xfrm/xfrm_state.c | 6 +++--- net/xfrm/xfrm_user.c | 12 ++++++------ 11 files changed, 21 insertions(+), 21 deletions(-)
drivers/tty/tty_audit.c +1 -1
@@ -67,7 +67,7 @@ static void tty_audit_log(const char *description, int major, int minor,struct task_struct *tsk = current;uid_t uid =from_kuid (&init_user_ns,task_uid (tsk));uid_t loginuid =from_kuid (&init_user_ns,audit_get_loginuid (tsk)); -u32 sessionid =audit_get_sessionid (tsk); +unsigned int sessionid =audit_get_sessionid (tsk); ab =audit_log_start (NULL ,GFP_KERNEL ,AUDIT_TTY );if (ab) {
include/linux/audit.h +1 -1
@@ -202,7 +202,7 @@ static inline kuid_t audit_get_loginuid(struct task_struct *tsk)return tsk->loginuid; } -static inline int audit_get_sessionid (struct task_struct *tsk) +static inline unsigned int audit_get_sessionid (struct task_struct *tsk) {return tsk->sessionid; }
include/linux/init_task.h +1 -1
@@ -95,7 +95,7 @@ extern struct group_info init_groups;#ifdef CONFIG_AUDITSYSCALL #define INIT_IDS \ .loginuid = INVALID_UID, \ - .sessionid = -1, + .sessionid = (unsigned int)-1,#else #define INIT_IDS #endif
include/net/netlabel.h +1 -1
@@ -111,7 +111,7 @@ struct cipso_v4_doi;struct netlbl_audit {u32 secid;kuid_t loginuid; -u32 sessionid; +unsigned int sessionid; };/*
include/net/xfrm.h +1 -1
@@ -679,7 +679,7 @@ struct xfrm_spi_skb_cb {struct xfrm_audit {u32 secid;kuid_t loginuid; -u32 sessionid; +unsigned int sessionid; };#ifdef CONFIG_AUDITSYSCALL
kernel/audit.c +1 -1
@@ -1490,7 +1490,7 @@ void audit_log_d_path(struct audit_buffer *ab, const char *prefix,void audit_log_session_info (struct audit_buffer *ab) { -u32 sessionid =audit_get_sessionid (current); +unsigned int sessionid =audit_get_sessionid (current);uid_t auid =from_kuid (&init_user_ns,audit_get_loginuid (current));audit_log_format (ab," auid=%u ses=%u" , auid, sessionid);
kernel/auditfilter.c +1 -1
@@ -1004,7 +1004,7 @@ static void audit_log_rule_change(char *action, struct audit_krule *rule, int re {struct audit_buffer *ab;uid_t loginuid =from_kuid (&init_user_ns,audit_get_loginuid (current)); -u32 sessionid =audit_get_sessionid (current); +unsigned int sessionid =audit_get_sessionid (current);if (!audit_enabled)return ;
kernel/auditsc.c +1 -1
@@ -2008,7 +2008,7 @@ int audit_set_loginuid(kuid_t loginuid)/* are we setting or clearing? */ if (uid_valid (loginuid)) - sessionid =atomic_inc_return (&session_id); + sessionid = (unsigned int )atomic_inc_return (&session_id); task->sessionid = sessionid; task->loginuid = loginuid;
net/xfrm/xfrm_policy.c +4 -4
@@ -2881,12 +2881,12 @@ static void xfrm_policy_fini(struct net *net)flush_work (&net->xfrm.policy_hash_work);#ifdef CONFIG_XFRM_SUB_POLICY audit_info.loginuid =INVALID_UID ; - audit_info.sessionid =-1 ; + audit_info.sessionid = (unsigned int )-1 ; audit_info.secid =0 ;xfrm_policy_flush (net,XFRM_POLICY_TYPE_SUB , &audit_info);#endif audit_info.loginuid =INVALID_UID ; - audit_info.sessionid =-1 ; + audit_info.sessionid = (unsigned int )-1 ; audit_info.secid =0 ;xfrm_policy_flush (net,XFRM_POLICY_TYPE_MAIN , &audit_info);
@@ -2992,7 +2992,7 @@ static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp, }void xfrm_audit_policy_add (struct xfrm_policy *xp,int result, -kuid_t auid,u32 sessionid,u32 secid) +kuid_t auid,unsigned int sessionid,u32 secid) {struct audit_buffer *audit_buf;
@@ -3007,7 +3007,7 @@ void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,EXPORT_SYMBOL_GPL (xfrm_audit_policy_add);void xfrm_audit_policy_delete (struct xfrm_policy *xp,int result, -kuid_t auid,u32 sessionid,u32 secid) +kuid_t auid,unsigned int sessionid,u32 secid) {struct audit_buffer *audit_buf;
net/xfrm/xfrm_state.c +3 -3
@@ -2040,7 +2040,7 @@ void xfrm_state_fini(struct net *net)flush_work (&net->xfrm.state_hash_work); audit_info.loginuid =INVALID_UID ; - audit_info.sessionid =-1 ; + audit_info.sessionid = (unsigned int )-1 ; audit_info.secid =0 ;xfrm_state_flush (net,IPSEC_PROTO_ANY , &audit_info);flush_work (&net->xfrm.state_gc_work);
@@ -2106,7 +2106,7 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family, }void xfrm_audit_state_add (struct xfrm_state *x,int result, -kuid_t auid,u32 sessionid,u32 secid) +kuid_t auid,unsigned int sessionid,u32 secid) {struct audit_buffer *audit_buf;
@@ -2121,7 +2121,7 @@ void xfrm_audit_state_add(struct xfrm_state *x, int result,EXPORT_SYMBOL_GPL (xfrm_audit_state_add);void xfrm_audit_state_delete (struct xfrm_state *x,int result, -kuid_t auid,u32 sessionid,u32 secid) +kuid_t auid,unsigned int sessionid,u32 secid) {struct audit_buffer *audit_buf;
net/xfrm/xfrm_user.c +6 -6
@@ -599,7 +599,7 @@ static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh,int err;struct km_event c;kuid_t loginuid =audit_get_loginuid (current); -u32 sessionid =audit_get_sessionid (current); +unsigned int sessionid =audit_get_sessionid (current);u32 sid; err =verify_newsa_info (p, attrs);
@@ -678,7 +678,7 @@ static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh,struct km_event c;struct xfrm_usersa_id *p =nlmsg_data (nlh);kuid_t loginuid =audit_get_loginuid (current); -u32 sessionid =audit_get_sessionid (current); +unsigned int sessionid =audit_get_sessionid (current);u32 sid; x =xfrm_user_state_lookup (net, p, attrs, &err);
@@ -1404,7 +1404,7 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,int err;int excl;kuid_t loginuid =audit_get_loginuid (current); -u32 sessionid =audit_get_sessionid (current); +unsigned int sessionid =audit_get_sessionid (current);u32 sid; err =verify_newpolicy_info (p);
@@ -1662,7 +1662,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, } }else {kuid_t loginuid =audit_get_loginuid (current); -u32 sessionid =audit_get_sessionid (current); +unsigned int sessionid =audit_get_sessionid (current);u32 sid;security_task_getsecid (current, &sid);
@@ -1958,7 +1958,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, err =0 ;if (up->hard) {kuid_t loginuid =audit_get_loginuid (current); -u32 sessionid =audit_get_sessionid (current); +unsigned int sessionid =audit_get_sessionid (current);u32 sid;security_task_getsecid (current, &sid);
@@ -2001,7 +2001,7 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh,if (ue->hard) {kuid_t loginuid =audit_get_loginuid (current); -u32 sessionid =audit_get_sessionid (current); +unsigned int sessionid =audit_get_sessionid (current);u32 sid;security_task_getsecid (current, &sid);
Signature · 1 line
1.8.3.1