[PATCH 21/26] audit: remove task argument to audit_set_loginuid

Eric Paris
2011-11-17T22:04:41Z

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>
---

fs/proc/base.c | 2 +-
include/linux/audit.h | 2 +-
kernel/auditsc.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index f200c72..be2b542 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1295,7 +1295,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 9734b1e..1b4b109 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -494,7 +494,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 d0b388c..a3f6f3c 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2225,16 +2225,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;