Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a300be6 authored by Eric Paris's avatar Eric Paris Committed by Al Viro
Browse files

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: default avatarEric Paris <eparis@redhat.com>
parent 54d3218b

fs/proc/base.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/audit.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

kernel/auditsc.c

+3 −3
Original line number Diff line number Diff line
@@ -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;