summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2013-11-06 16:47:17 +0100
committerEric Paris <eparis@redhat.com>2013-11-06 17:47:24 +0100
commit9175c9d2aed528800175ef81c90569d00d23f9be (patch)
tree8fc23922601961f97b25cf6e49dccaeee0a3b081
parentaudit: call audit_bprm() only once to add AUDIT_EXECVE information (diff)
downloadlinux-9175c9d2aed528800175ef81c90569d00d23f9be.tar.xz
linux-9175c9d2aed528800175ef81c90569d00d23f9be.zip
audit: fix type of sessionid in audit_set_loginuid()
sfr pointed out that with CONFIG_UIDGID_STRICT_TYPE_CHECKS set the audit tree would not build. This is because the oldsessionid in audit_set_loginuid() was accidentally being declared as a kuid_t. This patch fixes that declaration mistake. Example of problem: kernel/auditsc.c: In function 'audit_set_loginuid': kernel/auditsc.c:2003:15: error: incompatible types when assigning to type 'kuid_t' from type 'int' oldsessionid = audit_get_sessionid(current); Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Eric Paris <eparis@redhat.com>
-rw-r--r--kernel/auditsc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index dfc5d6745ee5..90594c9f7552 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1995,8 +1995,8 @@ static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid,
int audit_set_loginuid(kuid_t loginuid)
{
struct task_struct *task = current;
- unsigned int sessionid = -1;
- kuid_t oldloginuid, oldsessionid;
+ unsigned int oldsessionid, sessionid = (unsigned int)-1;
+ kuid_t oldloginuid;
int rc;
oldloginuid = audit_get_loginuid(current);