Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/sys/netinet Pull up following revision(s) (requested by m...



details:   https://anonhg.NetBSD.org/src/rev/2bcf56adab1c
branches:  netbsd-9
changeset: 962960:2bcf56adab1c
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Sep 10 16:18:59 2019 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #193):

        sys/netinet/tcp_timer.h: revision 1.30
        sys/netinet/tcp_input.c: revision 1.415
        sys/netinet/tcp_usrreq.c: revision 1.225
        sys/netinet/tcp_subr.c: revision 1.283

Clamp tcp timer quantities to reasonable ranges.

diffstat:

 sys/netinet/tcp_input.c  |   8 ++++----
 sys/netinet/tcp_subr.c   |  21 ++++++++++++++-------
 sys/netinet/tcp_timer.h  |   8 +++++++-
 sys/netinet/tcp_usrreq.c |  18 +++++++++++-------
 4 files changed, 36 insertions(+), 19 deletions(-)

diffs (188 lines):

diff -r 388ce271098f -r 2bcf56adab1c sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Tue Sep 10 16:16:46 2019 +0000
+++ b/sys/netinet/tcp_input.c   Tue Sep 10 16:18:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.414 2019/06/01 15:18:42 kamil Exp $    */
+/*     $NetBSD: tcp_input.c,v 1.414.2.1 2019/09/10 16:18:59 martin Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.414 2019/06/01 15:18:42 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.414.2.1 2019/09/10 16:18:59 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -3379,7 +3379,7 @@
                if (__predict_false(tcp_rttlocal) && tcp_msl_enable
                    && tp->t_srtt > tcp_msl_remote_threshold
                    && tp->t_msl  < tcp_msl_remote) {
-                       tp->t_msl = tcp_msl_remote;
+                       tp->t_msl = MIN(tcp_msl_remote, TCP_MAXMSL);
                }
        } else {
                /*
@@ -3647,7 +3647,7 @@
         * than the keep alive timer would allow, expire it.
         */
        sc->sc_rxttot += sc->sc_rxtcur;
-       if (sc->sc_rxttot >= tcp_keepinit)
+       if (sc->sc_rxttot >= MIN(tcp_keepinit, TCP_TIMER_MAXTICKS))
                goto dropit;
 
        TCP_STATINC(TCP_STAT_SC_RETRANSMITTED);
diff -r 388ce271098f -r 2bcf56adab1c sys/netinet/tcp_subr.c
--- a/sys/netinet/tcp_subr.c    Tue Sep 10 16:16:46 2019 +0000
+++ b/sys/netinet/tcp_subr.c    Tue Sep 10 16:18:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_subr.c,v 1.282 2018/12/27 16:59:17 maxv Exp $      */
+/*     $NetBSD: tcp_subr.c,v 1.282.4.1 2019/09/10 16:19:00 martin Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.282 2018/12/27 16:59:17 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.282.4.1 2019/09/10 16:19:00 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -948,11 +948,12 @@
            TCPTV_MIN, TCPTV_REXMTMAX);
 
        /* Keep Alive */
-       tp->t_keepinit = tcp_keepinit;
-       tp->t_keepidle = tcp_keepidle;
-       tp->t_keepintvl = tcp_keepintvl;
-       tp->t_keepcnt = tcp_keepcnt;
-       tp->t_maxidle = tp->t_keepcnt * tp->t_keepintvl;
+       tp->t_keepinit = MIN(tcp_keepinit, TCP_TIMER_MAXTICKS);
+       tp->t_keepidle = MIN(tcp_keepidle, TCP_TIMER_MAXTICKS);
+       tp->t_keepintvl = MIN(tcp_keepintvl, TCP_TIMER_MAXTICKS);
+       tp->t_keepcnt = MAX(1, MIN(tcp_keepcnt, TCP_TIMER_MAXTICKS));
+       tp->t_maxidle = tp->t_keepcnt * MIN(tp->t_keepintvl,
+           TCP_TIMER_MAXTICKS/tp->t_keepcnt);
 
        /* MSL */
        tp->t_msl = TCPTV_MSL;
@@ -2012,6 +2013,9 @@
                break;
        }
 
+       /* Clamp to a reasonable range.  */
+       tp->t_msl = MIN(tp->t_msl, TCP_MAXMSL);
+
 #ifdef INET6
        /* The !tp->t_inpcb lets the compiler know it can't be v4 *and* v6 */
        while (!tp->t_inpcb && tp->t_in6pcb) {
@@ -2041,6 +2045,9 @@
                tp->t_msl = tcp_msl_remote ? tcp_msl_remote : TCPTV_MSL;
                break;
        }
+
+       /* Clamp to a reasonable range.  */
+       tp->t_msl = MIN(tp->t_msl, TCP_MAXMSL);
 #endif
 
        tp->t_state = TCPS_ESTABLISHED;
diff -r 388ce271098f -r 2bcf56adab1c sys/netinet/tcp_timer.h
--- a/sys/netinet/tcp_timer.h   Tue Sep 10 16:16:46 2019 +0000
+++ b/sys/netinet/tcp_timer.h   Tue Sep 10 16:18:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_timer.h,v 1.29 2018/01/19 07:53:01 ozaki-r Exp $   */
+/*     $NetBSD: tcp_timer.h,v 1.29.8.1 2019/09/10 16:18:59 martin Exp $        */
 
 /*-
  * Copyright (c) 2001, 2005 The NetBSD Foundation, Inc.
@@ -165,6 +165,12 @@
 #define        TCP_TIMER_ISARMED(tp, timer)                                    \
        callout_active(&(tp)->t_timer[(timer)])
 
+#define        TCP_TIMER_MAXTICKS                                                    \
+       (INT_MAX / (hz / PR_SLOWHZ))
+
+#define        TCP_MAXMSL                                                            \
+       (TCP_TIMER_MAXTICKS / 2)
+
 /*
  * Force a time value to be in a certain range.
  */
diff -r 388ce271098f -r 2bcf56adab1c sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Tue Sep 10 16:16:46 2019 +0000
+++ b/sys/netinet/tcp_usrreq.c  Tue Sep 10 16:18:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.224 2019/02/05 04:48:47 mrg Exp $     */
+/*     $NetBSD: tcp_usrreq.c,v 1.224.4.1 2019/09/10 16:19:00 martin Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.224 2019/02/05 04:48:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.224.4.1 2019/09/10 16:19:00 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -209,7 +209,8 @@
 static void
 change_keepalive(struct socket *so, struct tcpcb *tp)
 {
-       tp->t_maxidle = tp->t_keepcnt * tp->t_keepintvl;
+       tp->t_maxidle = tp->t_keepcnt * MIN(tp->t_keepintvl,
+           TCP_TIMER_MAXTICKS / tp->t_keepcnt);
        TCP_TIMER_DISARM(tp, TCPT_KEEP);
        TCP_TIMER_DISARM(tp, TCPT_2MSL);
 
@@ -400,7 +401,7 @@
                        error = sockopt_get(sopt, &ui, sizeof(ui));
                        if (error)
                                break;
-                       if (ui > 0) {
+                       if (ui > 0 && ui <= TCP_TIMER_MAXTICKS) {
                                tp->t_keepidle = ui;
                                change_keepalive(so, tp);
                        } else
@@ -411,7 +412,7 @@
                        error = sockopt_get(sopt, &ui, sizeof(ui));
                        if (error)
                                break;
-                       if (ui > 0) {
+                       if (ui > 0 && ui <= TCP_TIMER_MAXTICKS) {
                                tp->t_keepintvl = ui;
                                change_keepalive(so, tp);
                        } else
@@ -422,7 +423,7 @@
                        error = sockopt_get(sopt, &ui, sizeof(ui));
                        if (error)
                                break;
-                       if (ui > 0) {
+                       if (ui > 0 && ui <= TCP_TIMER_MAXTICKS) {
                                tp->t_keepcnt = ui;
                                change_keepalive(so, tp);
                        } else
@@ -433,7 +434,7 @@
                        error = sockopt_get(sopt, &ui, sizeof(ui));
                        if (error)
                                break;
-                       if (ui > 0) {
+                       if (ui > 0 && ui <= TCP_TIMER_MAXTICKS) {
                                tp->t_keepinit = ui;
                                change_keepalive(so, tp);
                        } else
@@ -1961,6 +1962,9 @@
        if (error || newp == NULL)
                return error;
 
+       if (!(tmp > 0 && tmp <= TCP_TIMER_MAXTICKS))
+               return EINVAL;
+
        mutex_enter(softnet_lock);
 
        *(u_int *)rnode->sysctl_data = tmp;



Home | Main Index | Thread Index | Old Index