[src/trunk]: src/sys/netinet Make sure SYN_CACHE_TIMER_ARM() has been run bef...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6bfc15e5fa10
branches:  trunk
changeset: 755182:6bfc15e5fa10
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed May 26 17:38:29 2010 +0000

description:
Make sure SYN_CACHE_TIMER_ARM() has been run before calling syn_cache_put()
as it will reschedule the timer.  Fixes PR kern/43318.

diffstat:

 sys/netinet/tcp_input.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 262045a43c86 -r 6bfc15e5fa10 sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Wed May 26 16:58:13 2010 +0000
+++ b/sys/netinet/tcp_input.c   Wed May 26 17:38:29 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.304 2010/04/21 20:40:16 bouyer Exp $   */
+/*     $NetBSD: tcp_input.c,v 1.305 2010/05/26 17:38:29 bouyer Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -145,7 +145,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.304 2010/04/21 20:40:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.305 2010/05/26 17:38:29 bouyer Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -4207,6 +4207,11 @@
                syn_cache_insert(sc, tp);
        } else {
                s = splsoftnet();
+               /*
+                * syn_cache_put() will try to schedule the timer, so
+                * we need to initialize it
+                */
+               SYN_CACHE_TIMER_ARM(sc);
                syn_cache_put(sc);
                splx(s);
                TCP_STATINC(TCP_STAT_SC_DROPPED);