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

Commit 0c11b942 authored by Al Viro's avatar Al Viro
Browse files

[PATCH] switch audit_get_loginuid() to task_struct * 



all callers pass something->audit_context

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 24e1c13c

drivers/char/tty_audit.c

+1 −2
Original line number Diff line number Diff line
@@ -105,8 +105,7 @@ static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid, 
 */

static void tty_audit_buf_push_current(struct tty_audit_buf *buf)

{

	tty_audit_buf_push(current, audit_get_loginuid(current->audit_context),

			   buf);

	tty_audit_buf_push(current, audit_get_loginuid(current), buf);

}



/**

fs/proc/base.c

+1 −1
Original line number Diff line number Diff line
@@ -984,7 +984,7 @@ static ssize_t proc_loginuid_read(struct file * file, char __user * buf, 
	if (!task)

		return -ESRCH;

	length = scnprintf(tmpbuf, TMPBUFLEN, "%u",

				audit_get_loginuid(task->audit_context));

				audit_get_loginuid(task));

	put_task_struct(task);

	return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);

}

include/linux/audit.h

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ extern unsigned int audit_serial(void); 
extern void 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 uid_t audit_get_loginuid(struct audit_context *ctx);

extern uid_t audit_get_loginuid(struct task_struct *task);

extern void audit_log_task_context(struct audit_buffer *ab);

extern int __audit_ipc_obj(struct kern_ipc_perm *ipcp);

extern int __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode);
@@ -488,7 +488,7 @@ extern int audit_signals; 
#define audit_inode_child(d,i,p) do { ; } while (0)

#define audit_core_dumps(i) do { ; } while (0)

#define auditsc_get_stamp(c,t,s) do { BUG(); } while (0)

#define audit_get_loginuid(c) ({ -1; })

#define audit_get_loginuid(t) (-1)

#define audit_log_task_context(b) do { ; } while (0)

#define audit_ipc_obj(i) ({ 0; })

#define audit_ipc_set_perm(q,u,g,m) ({ 0; })

kernel/auditsc.c

+3 −2
Original line number Diff line number Diff line
@@ -1804,8 +1804,9 @@ int audit_set_loginuid(struct task_struct *task, uid_t loginuid) 
 *

 * Returns the context's loginuid or -1 if @ctx is NULL.

 */

uid_t audit_get_loginuid(struct audit_context *ctx)

uid_t audit_get_loginuid(struct task_struct *task)

{

	struct audit_context *ctx = task->audit_context;

	return ctx ? ctx->loginuid : -1;

}
@@ -2273,7 +2274,7 @@ void audit_core_dumps(long signr) 


	ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_ANOM_ABEND);

	audit_log_format(ab, "auid=%u uid=%u gid=%u",

			audit_get_loginuid(current->audit_context),

			audit_get_loginuid(current),

			current->uid, current->gid);

	selinux_get_task_sid(current, &sid);

	if (sid) {

net/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -2757,7 +2757,7 @@ static void __dev_set_promiscuity(struct net_device *dev, int inc) 
			"dev=%s prom=%d old_prom=%d auid=%u",

			dev->name, (dev->flags & IFF_PROMISC),

			(old_flags & IFF_PROMISC),

			audit_get_loginuid(current->audit_context));

			audit_get_loginuid(current));



		if (dev->change_rx_flags)

			dev->change_rx_flags(dev, IFF_PROMISC);