Commit 4c3de7e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit 

Pull audit fix from Paul Moore:
 "We've got an audit fix, and unfortunately it is big.

  While I'm not excited that we need to be sending you something this
  large during the -rcX phase, it does fix some very real, and very
  tangled, problems relating to locking, backlog queues, and the audit
  daemon connection.

  This code has passed our testsuite without problem and it has held up
  to my ad-hoc stress tests (arguably better than the existing code),
  please consider pulling this as fix for the next v4.11-rcX tag"

* 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit:
  audit: fix auditd/kernel connection state tracking
parents 424b6898 5b52330b

kernel/audit.c

+394 −245

File changed.

Preview size limit exceeded, changes collapsed.

kernel/audit.h

+2 −7
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ extern void audit_log_name(struct audit_context *context, 
			   struct audit_names *n, const struct path *path,

			   int record_num, int *call_panic);



extern int audit_pid;

extern int auditd_test_task(const struct task_struct *task);



#define AUDIT_INODE_BUCKETS	32

extern struct list_head audit_inode_hash[AUDIT_INODE_BUCKETS];
@@ -250,10 +250,6 @@ struct audit_netlink_list { 


int audit_send_list(void *);



struct audit_net {

	struct sock *nlsk;

};



extern int selinux_audit_rule_update(void);



extern struct mutex audit_filter_mutex;
@@ -340,8 +336,7 @@ extern int audit_filter(int msgtype, unsigned int listtype); 
extern int __audit_signal_info(int sig, struct task_struct *t);

static inline int audit_signal_info(int sig, struct task_struct *t)

{

	if (unlikely((audit_pid && t->tgid == audit_pid) ||

		     (audit_signals && !audit_dummy_context())))

	if (auditd_test_task(t) || (audit_signals && !audit_dummy_context()))

		return __audit_signal_info(sig, t);

	return 0;

}

kernel/auditsc.c

+3 −3
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ static enum audit_state audit_filter_syscall(struct task_struct *tsk, 
	struct audit_entry *e;

	enum audit_state state;



	if (audit_pid && tsk->tgid == audit_pid)

	if (auditd_test_task(tsk))

		return AUDIT_DISABLED;



	rcu_read_lock();
@@ -816,7 +816,7 @@ void audit_filter_inodes(struct task_struct *tsk, struct audit_context *ctx) 
{

	struct audit_names *n;



	if (audit_pid && tsk->tgid == audit_pid)

	if (auditd_test_task(tsk))

		return;



	rcu_read_lock();
@@ -2256,7 +2256,7 @@ int __audit_signal_info(int sig, struct task_struct *t) 
	struct audit_context *ctx = tsk->audit_context;

	kuid_t uid = current_uid(), t_uid = task_uid(t);



	if (audit_pid && t->tgid == audit_pid) {

	if (auditd_test_task(t)) {

		if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1 || sig == SIGUSR2) {

			audit_sig_pid = task_tgid_nr(tsk);

			if (uid_valid(tsk->loginuid))

CRA Git | Maintained and supported by SUSTech CRA and CCSE