diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 15:35:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 15:35:50 -0800 |
| commit | 07e309a972cae9de1807f48968f4673f6868e211 (patch) | |
| tree | 716f3aa32b2a36e92244a5fbe13ad36ed32d819f | |
| parent | 03aa8c8cfaec1aab6b1ea7fde656bbc893f6cff8 (diff) | |
| parent | cb5172d96d16df72db8b55146b0ec00bfd97f079 (diff) | |
| download | talos-op-linux-07e309a972cae9de1807f48968f4673f6868e211.tar.gz talos-op-linux-07e309a972cae9de1807f48968f4673f6868e211.zip | |
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
| -rw-r--r-- | kernel/audit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 8e09f0f55b4b..17b0d523afb3 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -102,12 +102,13 @@ struct audit_net { * This struct is RCU protected; you must either hold the RCU lock for reading * or the associated spinlock for writing. */ -static struct auditd_connection { +struct auditd_connection { struct pid *pid; u32 portid; struct net *net; struct rcu_head rcu; -} *auditd_conn = NULL; +}; +static struct auditd_connection __rcu *auditd_conn; static DEFINE_SPINLOCK(auditd_conn_lock); /* If audit_rate_limit is non-zero, limit the rate of sending audit records |
