diff options
author | Eric Paris <eparis@redhat.com> | 2012-01-03 14:23:08 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-17 16:17:00 -0500 |
commit | 0a300be6d5be8f66cd96609334710c268d0bfdce (patch) | |
tree | 253d0d1e0aa28a6bdf883bb92e4b62fafe263563 | |
parent | 54d3218b31aee5bc9c859ae60fbde933d922448b (diff) |
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>
-rw-r--r-- | fs/proc/base.c | 2 | ||||
-rw-r--r-- | include/linux/audit.h | 2 | ||||
-rw-r--r-- | kernel/auditsc.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 8173dfd89cb2..e3cbebbabebd 100644 --- 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, | |||
1228 | goto out_free_page; | 1228 | goto out_free_page; |
1229 | 1229 | ||
1230 | } | 1230 | } |
1231 | length = audit_set_loginuid(current, loginuid); | 1231 | length = audit_set_loginuid(loginuid); |
1232 | if (likely(length == 0)) | 1232 | if (likely(length == 0)) |
1233 | length = count; | 1233 | length = count; |
1234 | 1234 | ||
diff --git a/include/linux/audit.h b/include/linux/audit.h index e36aa37c88af..7cbd6fe41573 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
@@ -489,7 +489,7 @@ static inline void audit_ptrace(struct task_struct *t) | |||
489 | extern unsigned int audit_serial(void); | 489 | extern unsigned int audit_serial(void); |
490 | extern int auditsc_get_stamp(struct audit_context *ctx, | 490 | extern int auditsc_get_stamp(struct audit_context *ctx, |
491 | struct timespec *t, unsigned int *serial); | 491 | struct timespec *t, unsigned int *serial); |
492 | extern int audit_set_loginuid(struct task_struct *task, uid_t loginuid); | 492 | extern int audit_set_loginuid(uid_t loginuid); |
493 | #define audit_get_loginuid(t) ((t)->loginuid) | 493 | #define audit_get_loginuid(t) ((t)->loginuid) |
494 | #define audit_get_sessionid(t) ((t)->sessionid) | 494 | #define audit_get_sessionid(t) ((t)->sessionid) |
495 | extern void audit_log_task_context(struct audit_buffer *ab); | 495 | extern void audit_log_task_context(struct audit_buffer *ab); |
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 87b375fb12ff..9d6dd7d869c0 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -2163,16 +2163,16 @@ int auditsc_get_stamp(struct audit_context *ctx, | |||
2163 | static atomic_t session_id = ATOMIC_INIT(0); | 2163 | static atomic_t session_id = ATOMIC_INIT(0); |
2164 | 2164 | ||
2165 | /** | 2165 | /** |
2166 | * audit_set_loginuid - set a task's audit_context loginuid | 2166 | * audit_set_loginuid - set current task's audit_context loginuid |
2167 | * @task: task whose audit context is being modified | ||
2168 | * @loginuid: loginuid value | 2167 | * @loginuid: loginuid value |
2169 | * | 2168 | * |
2170 | * Returns 0. | 2169 | * Returns 0. |
2171 | * | 2170 | * |
2172 | * Called (set) from fs/proc/base.c::proc_loginuid_write(). | 2171 | * Called (set) from fs/proc/base.c::proc_loginuid_write(). |
2173 | */ | 2172 | */ |
2174 | int audit_set_loginuid(struct task_struct *task, uid_t loginuid) | 2173 | int audit_set_loginuid(uid_t loginuid) |
2175 | { | 2174 | { |
2175 | struct task_struct *task = current; | ||
2176 | unsigned int sessionid = atomic_inc_return(&session_id); | 2176 | unsigned int sessionid = atomic_inc_return(&session_id); |
2177 | struct audit_context *context = task->audit_context; | 2177 | struct audit_context *context = task->audit_context; |
2178 | 2178 | ||