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

Commit 456be6cd authored by Steve Grubb's avatar Steve Grubb Committed by David Woodhouse
Browse files

[AUDIT] LOGIN message credentials 



Attached is a new patch that solves the issue of getting valid credentials 
into the LOGIN message. The current code was assuming that the audit context 
had already been copied. This is not always the case for LOGIN messages.

To solve the problem, the patch passes the task struct to the function that 
emits the message where it can get valid credentials.

Signed-off-by: default avatarSteve Grubb <sgrubb@redhat.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 37509e74

fs/proc/base.c

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static ssize_t proc_loginuid_write(struct file * file, const char __user * buf, 
		goto out_free_page;



	}

	length = audit_set_loginuid(task->audit_context, loginuid);

	length = audit_set_loginuid(task, loginuid);

	if (likely(length == 0))

		length = count;

include/linux/audit.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ extern int audit_receive_filter(int type, int pid, int uid, int seq, 
				 void *data, uid_t loginuid);

extern void audit_get_stamp(struct audit_context *ctx,

			    struct timespec *t, unsigned int *serial);

extern int  audit_set_loginuid(struct audit_context *ctx, uid_t loginuid);

extern int  audit_set_loginuid(struct task_struct *task, uid_t loginuid);

extern uid_t audit_get_loginuid(struct audit_context *ctx);

extern int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode);

#else

kernel/auditsc.c

+5 −4
Original line number Diff line number Diff line
@@ -1010,20 +1010,21 @@ void audit_get_stamp(struct audit_context *ctx, 


extern int audit_set_type(struct audit_buffer *ab, int type);



int audit_set_loginuid(struct audit_context *ctx, uid_t loginuid)

int audit_set_loginuid(struct task_struct *task, uid_t loginuid)

{

	if (ctx) {

	if (task->audit_context) {

		struct audit_buffer *ab;



		ab = audit_log_start(NULL);

		if (ab) {

			audit_log_format(ab, "login pid=%d uid=%u "

				"old loginuid=%u new loginuid=%u",

				ctx->pid, ctx->uid, ctx->loginuid, loginuid);

				task->pid, task->uid, 

				task->audit_context->loginuid, loginuid);

			audit_set_type(ab, AUDIT_LOGIN);

			audit_log_end(ab);

		}

		ctx->loginuid = loginuid;

		task->audit_context->loginuid = loginuid;

	}

	return 0;

}