Commit 07e309a9 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull audit update from Paul Moore:
 "One small audit patch for the Linux v5.6 merge window, and
  unsurprisingly it passes our test suite with flying colors"

* tag 'audit-pr-20200127' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
  audit: Add __rcu annotation to RCU pointer
parents 03aa8c8c cb5172d9
...@@ -102,12 +102,13 @@ struct audit_net { ...@@ -102,12 +102,13 @@ struct audit_net {
* This struct is RCU protected; you must either hold the RCU lock for reading * This struct is RCU protected; you must either hold the RCU lock for reading
* or the associated spinlock for writing. * or the associated spinlock for writing.
*/ */
static struct auditd_connection { struct auditd_connection {
struct pid *pid; struct pid *pid;
u32 portid; u32 portid;
struct net *net; struct net *net;
struct rcu_head rcu; struct rcu_head rcu;
} *auditd_conn = NULL; };
static struct auditd_connection __rcu *auditd_conn;
static DEFINE_SPINLOCK(auditd_conn_lock); static DEFINE_SPINLOCK(auditd_conn_lock);
/* If audit_rate_limit is non-zero, limit the rate of sending audit records /* If audit_rate_limit is non-zero, limit the rate of sending audit records
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment