Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4440e854 authored by Eric Paris's avatar Eric Paris
Browse files

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: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarRichard Guy Briggs <rgb@redhat.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent ff235f51

drivers/tty/tty_audit.c

+1 −1
Original line number Diff line number Diff line
@@ -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/init_task.h

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

+10 −10
Original line number Diff line number Diff line
@@ -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
@@ -697,7 +697,7 @@ static inline struct audit_buffer *xfrm_audit_start(const char *op) 
	return audit_buf;

}



static inline void xfrm_audit_helper_usrinfo(kuid_t auid, u32 ses, u32 secid,

static inline void xfrm_audit_helper_usrinfo(kuid_t auid, unsigned int ses, u32 secid,

					     struct audit_buffer *audit_buf)

{

	char *secctx;
@@ -714,13 +714,13 @@ static inline void xfrm_audit_helper_usrinfo(kuid_t auid, u32 ses, u32 secid, 
}



extern void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,

				  kuid_t auid, u32 ses, u32 secid);

				  kuid_t auid, unsigned int ses, u32 secid);

extern void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result,

				  kuid_t auid, u32 ses, u32 secid);

				  kuid_t auid, unsigned int ses, u32 secid);

extern void xfrm_audit_state_add(struct xfrm_state *x, int result,

				 kuid_t auid, u32 ses, u32 secid);

				 kuid_t auid, unsigned int ses, u32 secid);

extern void xfrm_audit_state_delete(struct xfrm_state *x, int result,

				    kuid_t auid, u32 ses, u32 secid);

				    kuid_t auid, unsigned int ses, u32 secid);

extern void xfrm_audit_state_replay_overflow(struct xfrm_state *x,

					     struct sk_buff *skb);

extern void xfrm_audit_state_replay(struct xfrm_state *x,
@@ -733,22 +733,22 @@ extern void xfrm_audit_state_icvfail(struct xfrm_state *x, 
#else



static inline void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,

				  kuid_t auid, u32 ses, u32 secid)

				  kuid_t auid, unsigned int ses, u32 secid)

{

}



static inline void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result,

				  kuid_t auid, u32 ses, u32 secid)

				  kuid_t auid, unsigned int ses, u32 secid)

{

}



static inline void xfrm_audit_state_add(struct xfrm_state *x, int result,

				 kuid_t auid, u32 ses, u32 secid)

				 kuid_t auid, unsigned int ses, u32 secid)

{

}



static inline void xfrm_audit_state_delete(struct xfrm_state *x, int result,

				    kuid_t auid, u32 ses, u32 secid)

				    kuid_t auid, unsigned int ses, u32 secid)

{

}

kernel/audit.c

+1 −1
Original line number Diff line number Diff line
@@ -1611,7 +1611,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);