Skip to content

Commit 07e309a

Browse files
committed
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
2 parents 03aa8c8 + cb5172d commit 07e309a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

kernel/audit.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,13 @@ struct audit_net {
102102
* This struct is RCU protected; you must either hold the RCU lock for reading
103103
* or the associated spinlock for writing.
104104
*/
105-
static struct auditd_connection {
105+
struct auditd_connection {
106106
struct pid *pid;
107107
u32 portid;
108108
struct net *net;
109109
struct rcu_head rcu;
110-
} *auditd_conn = NULL;
110+
};
111+
static struct auditd_connection __rcu *auditd_conn;
111112
static DEFINE_SPINLOCK(auditd_conn_lock);
112113

113114
/* If audit_rate_limit is non-zero, limit the rate of sending audit records

0 commit comments

Comments
 (0)