From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gao feng Subject: [PATCH v2] audit: fix incorrect type of sessionid Date: Sat, 2 Nov 2013 14:45:02 +0800 Message-ID: <1383374702-18587-1-git-send-email-gaofeng@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: linux-audit@redhat.com Cc: rgb@redhat.com List-Id: linux-audit@redhat.com The type of task->sessionid is unsigned int, the return type of audit_get_sessionid should be consistent with it. And this patch also changes the type of oldsessionid to unsigned int. Signed-off-by: Gao feng --- include/linux/audit.h | 4 ++-- kernel/auditsc.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/audit.h b/include/linux/audit.h index 7b31bec..01b40f7 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -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; } @@ -360,7 +360,7 @@ static inline kuid_t audit_get_loginuid(struct task_struct *tsk) { return INVALID_UID; } -static inline int audit_get_sessionid(struct task_struct *tsk) +static inline unsigned int audit_get_sessionid(struct task_struct *tsk) { return -1; } diff --git a/kernel/auditsc.c b/kernel/auditsc.c index ceb396f..e4aaa9d 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -2018,7 +2018,8 @@ int audit_set_loginuid(kuid_t loginuid) { struct task_struct *task = current; unsigned int sessionid = -1; - kuid_t oldloginuid, oldsessionid; + kuid_t oldloginuid; + unsigned int oldsessionid; int rc; oldloginuid = audit_get_loginuid(current); -- 1.8.3.1