[src/trunk]: src/sys/netinet Don't pass a pointer to tcp_reass, otherwise it ...

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

details:   https://anonhg.NetBSD.org/src/rev/39f77d36e162
branches:  trunk
changeset: 360675:39f77d36e162
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu Mar 22 21:19:28 2018 +0000

description:
Don't pass a pointer to tcp_reass, otherwise it looks like it can modify
tlen while it doesn't.

diffstat:

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

diffs (79 lines):

diff -r 17aa0671f0d6 -r 39f77d36e162 sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Thu Mar 22 21:10:17 2018 +0000
+++ b/sys/netinet/tcp_input.c   Thu Mar 22 21:19:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.385 2018/03/22 21:10:17 maxv Exp $     */
+/*     $NetBSD: tcp_input.c,v 1.386 2018/03/22 21:19:28 maxv 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.385 2018/03/22 21:10:17 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.386 2018/03/22 21:19:28 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -390,7 +390,7 @@
 #endif /* TCP_REASS_COUNTERS */
 
 static int tcp_reass(struct tcpcb *, const struct tcphdr *, struct mbuf *,
-    int *);
+    int);
 static int tcp_dooptions(struct tcpcb *, const u_char *, int,
     struct tcphdr *, struct mbuf *, int, struct tcp_opt_info *);
 
@@ -441,7 +441,7 @@
 }
 
 static int
-tcp_reass(struct tcpcb *tp, const struct tcphdr *th, struct mbuf *m, int *tlen)
+tcp_reass(struct tcpcb *tp, const struct tcphdr *th, struct mbuf *m, int tlen)
 {
        struct ipqent *p, *q, *nq, *tiqe = NULL;
        struct socket *so = NULL;
@@ -473,13 +473,13 @@
 
        m_claimm(m, &tcp_reass_mowner);
 
-       rcvoobyte = *tlen;
+       rcvoobyte = tlen;
        /*
         * Copy these to local variables because the tcpiphdr
         * gets munged while we are collapsing mbufs.
         */
        pkt_seq = th->th_seq;
-       pkt_len = *tlen;
+       pkt_len = tlen;
        pkt_flags = th->th_flags;
 
        TCP_REASS_COUNTER_INCR(&tcp_reass_);
@@ -2183,7 +2183,7 @@
                                tp->rcv_scale = tp->request_r_scale;
                        }
                        TCP_REASS_LOCK(tp);
-                       (void) tcp_reass(tp, NULL, NULL, &tlen);
+                       (void)tcp_reass(tp, NULL, NULL, tlen);
                        /*
                         * if we didn't have to retransmit the SYN,
                         * use its rtt as our initial srtt & rtt var.
@@ -2511,7 +2511,7 @@
                        tp->rcv_scale = tp->request_r_scale;
                }
                TCP_REASS_LOCK(tp);
-               (void) tcp_reass(tp, NULL, NULL, &tlen);
+               (void)tcp_reass(tp, NULL, NULL, tlen);
                tp->snd_wl1 = th->th_seq - 1;
                /* fall into ... */
 
@@ -2847,7 +2847,7 @@
                        sorwakeup(so);
                } else {
                        m_adj(m, hdroptlen);
-                       tiflags = tcp_reass(tp, th, m, &tlen);
+                       tiflags = tcp_reass(tp, th, m, tlen);
                        tp->t_flags |= TF_ACKNOW;
                }