On 2016-11-29 23:52, Richard Guy Briggs wrote: > On 2016-11-29 15:13, Cong Wang wrote: > > On Tue, Nov 29, 2016 at 8:48 AM, Richard Guy Briggs <r...@redhat.com> wrote: > > > On 2016-11-26 17:11, Cong Wang wrote: > > >> It is racy on audit_sock, especially on the netns exit path. > > > > > > I think that is the only place it is racy. The other places audit_sock > > > is set is when the socket failure has just triggered a reset. > > > > > > Is there a notifier callback for failed or reaped sockets? > > > > Is NETLINK_URELEASE event what you are looking for? > > Possibly, yes. Thanks, I'll have a look.
I tried a quick compile attempt on the test case (I assume it is a socket fuzzer) and get the following compile error: cc -g -O0 -Wall -D_GNU_SOURCE -o socket_fuzz socket_fuzz.c socket_fuzz.c:16:1: warning: "_GNU_SOURCE" redefined <command-line>: warning: this is the location of the previous definition socket_fuzz.c: In function ‘segv_handler’: socket_fuzz.c:89: warning: implicit declaration of function ‘__atomic_load_n’ socket_fuzz.c:89: error: ‘__ATOMIC_RELAXED’ undeclared (first use in this function) socket_fuzz.c:89: error: (Each undeclared identifier is reported only once socket_fuzz.c:89: error: for each function it appears in.) socket_fuzz.c: In function ‘loop’: socket_fuzz.c:280: warning: unused variable ‘errno0’ socket_fuzz.c: In function ‘test’: socket_fuzz.c:303: warning: implicit declaration of function ‘__atomic_fetch_add’ socket_fuzz.c:303: error: ‘__ATOMIC_SEQ_CST’ undeclared (first use in this function) socket_fuzz.c:303: warning: implicit declaration of function ‘__atomic_fetch_sub’ I also tried to extend Cong Wang's idea to attempt to proactively respond to a NETLINK_URELEASE on the audit_sock and reset it, but ran into a locking error stack dump using mutex_lock(&audit_cmd_mutex) in the notifier callback. Eliminating the lock since the sock is dead anways eliminates the error. Is it safe? I'll resubmit if this looks remotely sane. Meanwhile I'll try to get the test case to compile. This is being tracked as https://github.com/linux-audit/audit-kernel/issues/30 Subject: [PATCH] audit: proactively reset audit_sock on matching NETLINK_URELEASE diff --git a/kernel/audit.c b/kernel/audit.c index f1ca116..91d222d 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -423,6 +423,7 @@ static void kauditd_send_skb(struct sk_buff *skb) snprintf(s, sizeof(s), "audit_pid=%d reset", audit_pid); audit_log_lost(s); audit_pid = 0; + audit_nlk_portid = 0; audit_sock = NULL; } else { pr_warn("re-scheduling(#%d) write to audit_pid=%d\n", @@ -1143,6 +1144,28 @@ static int audit_bind(struct net *net, int group) return 0; } +static int audit_sock_netlink_notify(struct notifier_block *nb, + unsigned long event, + void *_notify) +{ + struct netlink_notify *notify = _notify; + struct audit_net *aunet = net_generic(notify->net, audit_net_id); + + if (event == NETLINK_URELEASE && notify->protocol == NETLINK_AUDIT) { + if (audit_nlk_portid == notify->portid && + audit_sock == aunet->nlsk) { + audit_pid = 0; + audit_nlk_portid = 0; + audit_sock = NULL; + } + } + return NOTIFY_DONE; +} + +static struct notifier_block audit_netlink_notifier = { + .notifier_call = audit_sock_netlink_notify, +}; + static int __net_init audit_net_init(struct net *net) { struct netlink_kernel_cfg cfg = { @@ -1167,10 +1190,14 @@ static void __net_exit audit_net_exit(struct net *net) { struct audit_net *aunet = net_generic(net, audit_net_id); struct sock *sock = aunet->nlsk; + + mutex_lock(&audit_cmd_mutex); if (sock == audit_sock) { audit_pid = 0; + audit_nlk_portid = 0; audit_sock = NULL; } + mutex_unlock(&audit_cmd_mutex); RCU_INIT_POINTER(aunet->nlsk, NULL); synchronize_net(); @@ -1202,6 +1229,7 @@ static int __init audit_init(void) audit_enabled = audit_default; audit_ever_enabled |= !!audit_default; + netlink_register_notifier(&audit_netlink_notifier); audit_log(NULL, GFP_KERNEL, AUDIT_KERNEL, "initialized"); for (i = 0; i < AUDIT_INODE_BUCKETS; i++) -- 1.7.1 > - RGB - RGB -- Richard Guy Briggs <r...@redhat.com> Kernel Security Engineering, Base Operating Systems, Red Hat Remote, Ottawa, Canada Voice: +1.647.777.2635, Internal: (81) 32635
