audit: remove task argument to audit_set_loginuid

The function always deals with current.  Don't expose an option
pretending one can use it for something.  You can't.

Signed-off-by: Eric Paris <eparis@redhat.com>

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 8173dfd89cb262ac506e64e475fa5c0cd9742c8e..e3cbebbabebd9a29c87a3e83ff838d53b7dd4caf 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1228,7 +1228,7 @@ static ssize_t proc_loginuid_write(struct file * file, const char __user * buf,
                goto out_free_page;
 
        }
-       length = audit_set_loginuid(current, loginuid);
+       length = audit_set_loginuid(loginuid);
        if (likely(length == 0))
                length = count;
 

diff --git a/include/linux/audit.h b/include/linux/audit.h
index e36aa37c88af8c9aa0ff42743d7a84ba7a4bf590..7cbd6fe415735a30dcefdfc9c081dd4c8e165e89 100644 (file)
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -489,7 +489,7 @@ static inline void audit_ptrace(struct task_struct *t)
 extern unsigned int audit_serial(void);
 extern int auditsc_get_stamp(struct audit_context *ctx,
                              struct timespec *t, unsigned int *serial);
-extern int  audit_set_loginuid(struct task_struct *task, uid_t loginuid);
+extern int  audit_set_loginuid(uid_t loginuid);
 #define audit_get_loginuid(t) ((t)->loginuid)
 #define audit_get_sessionid(t) ((t)->sessionid)
 extern void audit_log_task_context(struct audit_buffer *ab);

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 87b375fb12ffd6d71dadbc8598d53852f109f4c0..9d6dd7d869c05b7a612d18f7951aaf761c187425 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2163,16 +2163,16 @@ int auditsc_get_stamp(struct audit_context *ctx,
 static atomic_t session_id = ATOMIC_INIT(0);
 
 /**
- * audit_set_loginuid - set a task's audit_context loginuid
- * @task: task whose audit context is being modified
+ * audit_set_loginuid - set current task's audit_context loginuid
  * @loginuid: loginuid value
  *
  * Returns 0.
  *
  * Called (set) from fs/proc/base.c::proc_loginuid_write().
  */
-int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
+int audit_set_loginuid(uid_t loginuid)
 {
+       struct task_struct *task = current;
        unsigned int sessionid = atomic_inc_return(&session_id);
        struct audit_context *context = task->audit_context;