Commit 23b6ba45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'audit-pr-20210215' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit 

Pull audit updates from Paul Moore:
 "Three very trivial patches for audit this time"

* tag 'audit-pr-20210215' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
  audit: Make audit_filter_syscall() return void
  audit: Remove leftover reference to the audit_tasklet
  kernel/audit: convert comma to semicolon
parents d1fec221 127c8c5f

kernel/audit.c

+2 −2
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid, 


	uid = from_kuid(&init_user_ns, task_uid(current));

	oldloginuid = from_kuid(&init_user_ns, koldloginuid);

	loginuid = from_kuid(&init_user_ns, kloginuid),

	loginuid = from_kuid(&init_user_ns, kloginuid);

	tty = audit_get_tty();



	audit_log_format(ab, "pid=%d uid=%u", task_tgid_nr(current), uid);
@@ -2365,7 +2365,7 @@ int audit_signal_info(int sig, struct task_struct *t) 
 *

 * We can not do a netlink send inside an irq context because it blocks (last

 * arg, flags, is not set to MSG_DONTWAIT), so the audit buffer is placed on a

 * queue and a tasklet is scheduled to remove them from the queue outside the

 * queue and a kthread is scheduled to remove them from the queue outside the

 * irq context.  May be called in any context.

 */

void audit_log_end(struct audit_buffer *ab)

kernel/auditsc.c

+8 −8
Original line number Diff line number Diff line
@@ -799,12 +799,12 @@ static int audit_in_mask(const struct audit_krule *rule, unsigned long val) 
	return rule->mask[word] & bit;

}



/* At syscall entry and exit time, this filter is called if the

 * audit_state is not low enough that auditing cannot take place, but is

 * also not high enough that we already know we have to write an audit

 * record (i.e., the state is AUDIT_SETUP_CONTEXT or AUDIT_BUILD_CONTEXT).

/* At syscall exit time, this filter is called if the audit_state is

 * not low enough that auditing cannot take place, but is also not

 * high enough that we already know we have to write an audit record

 * (i.e., the state is AUDIT_SETUP_CONTEXT or AUDIT_BUILD_CONTEXT).

 */

static enum audit_state audit_filter_syscall(struct task_struct *tsk,

static void audit_filter_syscall(struct task_struct *tsk,

					     struct audit_context *ctx,

					     struct list_head *list)

{
@@ -812,7 +812,7 @@ static enum audit_state audit_filter_syscall(struct task_struct *tsk, 
	enum audit_state state;



	if (auditd_test_task(tsk))

		return AUDIT_DISABLED;

		return;



	rcu_read_lock();

	list_for_each_entry_rcu(e, list, list) {
@@ -821,11 +821,11 @@ static enum audit_state audit_filter_syscall(struct task_struct *tsk, 
				       &state, false)) {

			rcu_read_unlock();

			ctx->current_state = state;

			return state;

			return;

		}

	}

	rcu_read_unlock();

	return AUDIT_BUILD_CONTEXT;

	return;

}



/*