lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 14 Aug 2015 00:13:24 +0300 From: Nikolay Aleksandrov <nikolay@...ulusnetworks.com> To: Eric Dumazet <eric.dumazet@...il.com> Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org Subject: Re: [PATCH net] inet: fix races with reqsk timers > On Aug 13, 2015, at 11:44 PM, Eric Dumazet <eric.dumazet@...il.com> wrote: > > On Thu, 2015-08-13 at 13:19 -0700, Eric Dumazet wrote: > >> >> A caller handler can not call del_timer_sync() > > A timer handler can not call del_timer_sync() > > I am testing a minimal fix : > > diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c > index 05e3145f7dc3..134957159c27 100644 > --- a/net/ipv4/inet_connection_sock.c > +++ b/net/ipv4/inet_connection_sock.c > @@ -593,7 +593,7 @@ static bool reqsk_queue_unlink(struct request_sock_queue *queue, > } > > spin_unlock(&queue->syn_wait_lock); > - if (del_timer_sync(&req->rsk_timer)) > + if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer)) > reqsk_put(req); > return found; > } > > Wouldn’t try_to_del_timer_sync(&req->rsk_timer) > 0 be better ? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists