From 5e11813d3cd397c0b92eaf9ef7d4babf68630f2d Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@redhat.com>
Date: Fri, 29 Apr 2005 17:30:07 +0100
Subject: [PATCH] --- yaml --- r: 591 b: refs/heads/master c:
 456be6cd90dbbb9b0ea01d56932d56d110d51cf7 h: refs/heads/master i:   589:
 c8fa1de7533f45ce8a91c33a15e968818872e248   587:
 82e99e86ed6285fa9e9f93c99fb42f45cb88f434   583:
 f98cf4d76e7a09a1f71fa35aeeccbf6b34e4f9c1   575:
 04f7d65437b67cf2c377d9b7d174d701afc096a0 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/proc/base.c        | 2 +-
 trunk/include/linux/audit.h | 2 +-
 trunk/kernel/auditsc.c      | 9 +++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 49c70c15a912..e56d2c4840f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37509e749dc2072e667db806ef24b9e897f61b8a
+refs/heads/master: 456be6cd90dbbb9b0ea01d56932d56d110d51cf7
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index 39fd336cfdb9..57554bfbed79 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -820,7 +820,7 @@ static ssize_t proc_loginuid_write(struct file * file, const char __user * buf,
 		goto out_free_page;
 
 	}
-	length = audit_set_loginuid(task->audit_context, loginuid);
+	length = audit_set_loginuid(task, loginuid);
 	if (likely(length == 0))
 		length = count;
 
diff --git a/trunk/include/linux/audit.h b/trunk/include/linux/audit.h
index 19f214230fec..19f04b049798 100644
--- a/trunk/include/linux/audit.h
+++ b/trunk/include/linux/audit.h
@@ -187,7 +187,7 @@ extern int  audit_receive_filter(int type, int pid, int uid, int seq,
 				 void *data, uid_t loginuid);
 extern void audit_get_stamp(struct audit_context *ctx,
 			    struct timespec *t, unsigned int *serial);
-extern int  audit_set_loginuid(struct audit_context *ctx, uid_t loginuid);
+extern int  audit_set_loginuid(struct task_struct *task, uid_t loginuid);
 extern uid_t audit_get_loginuid(struct audit_context *ctx);
 extern int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode);
 #else
diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c
index 66148f81d783..37b3ac94bc47 100644
--- a/trunk/kernel/auditsc.c
+++ b/trunk/kernel/auditsc.c
@@ -1010,20 +1010,21 @@ void audit_get_stamp(struct audit_context *ctx,
 
 extern int audit_set_type(struct audit_buffer *ab, int type);
 
-int audit_set_loginuid(struct audit_context *ctx, uid_t loginuid)
+int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
 {
-	if (ctx) {
+	if (task->audit_context) {
 		struct audit_buffer *ab;
 
 		ab = audit_log_start(NULL);
 		if (ab) {
 			audit_log_format(ab, "login pid=%d uid=%u "
 				"old loginuid=%u new loginuid=%u",
-				ctx->pid, ctx->uid, ctx->loginuid, loginuid);
+				task->pid, task->uid, 
+				task->audit_context->loginuid, loginuid);
 			audit_set_type(ab, AUDIT_LOGIN);
 			audit_log_end(ab);
 		}
-		ctx->loginuid = loginuid;
+		task->audit_context->loginuid = loginuid;
 	}
 	return 0;
 }