1 files changed, 16 insertions, 16 deletions

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index b299da5ff499..b14266bb91eb 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -821,8 +821,7 @@ static void tcp_v4_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
  */
 static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst,
                               struct request_sock *req,
-                              u16 queue_mapping,
-                              bool nocache)
+                              u16 queue_mapping)
 {
         const struct inet_request_sock *ireq = inet_rsk(req);
         struct flowi4 fl4;
@@ -852,7 +851,7 @@ static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst,
 
 static int tcp_v4_rtx_synack(struct sock *sk, struct request_sock *req)
 {
-        int res = tcp_v4_send_synack(sk, NULL, req, 0, false);
+        int res = tcp_v4_send_synack(sk, NULL, req, 0);
 
         if (!res)
                 TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_RETRANSSEGS);
@@ -890,7 +889,7 @@ bool tcp_syn_flood_action(struct sock *sk,
                 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPREQQFULLDROP);
 
         lopt = inet_csk(sk)->icsk_accept_queue.listen_opt;
-        if (!lopt->synflood_warned) {
+        if (!lopt->synflood_warned && sysctl_tcp_syncookies != 2) {
                 lopt->synflood_warned = 1;
                 pr_info("%s: Possible SYN flooding on port %d. %s.  Check SNMP counters.\n",
                         proto, ntohs(tcp_hdr(skb)->dest), msg);
@@ -1316,9 +1315,11 @@ static bool tcp_fastopen_check(struct sock *sk, struct sk_buff *skb,
                 tcp_rsk(req)->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
                 return true;
         }
+
         if (foc->len == TCP_FASTOPEN_COOKIE_SIZE) {
                 if ((sysctl_tcp_fastopen & TFO_SERVER_COOKIE_NOT_CHKED) == 0) {
-                        tcp_fastopen_cookie_gen(ip_hdr(skb)->saddr, valid_foc);
+                        tcp_fastopen_cookie_gen(ip_hdr(skb)->saddr,
+                                                ip_hdr(skb)->daddr, valid_foc);
                         if ((valid_foc->len != TCP_FASTOPEN_COOKIE_SIZE) ||
                             memcmp(&foc->val[0], &valid_foc->val[0],
                             TCP_FASTOPEN_COOKIE_SIZE) != 0)
@@ -1329,14 +1330,16 @@ static bool tcp_fastopen_check(struct sock *sk, struct sk_buff *skb,
                 tcp_rsk(req)->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
                 return true;
         } else if (foc->len == 0) { /* Client requesting a cookie */
-                tcp_fastopen_cookie_gen(ip_hdr(skb)->saddr, valid_foc);
+                tcp_fastopen_cookie_gen(ip_hdr(skb)->saddr,
+                                        ip_hdr(skb)->daddr, valid_foc);
                 NET_INC_STATS_BH(sock_net(sk),
                     LINUX_MIB_TCPFASTOPENCOOKIEREQD);
         } else {
                 /* Client sent a cookie with wrong size. Treat it
                  * the same as invalid and return a valid one.
                  */
-                tcp_fastopen_cookie_gen(ip_hdr(skb)->saddr, valid_foc);
+                tcp_fastopen_cookie_gen(ip_hdr(skb)->saddr,
+                                        ip_hdr(skb)->daddr, valid_foc);
         }
         return false;
 }
@@ -1462,7 +1465,8 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
          * limitations, they conserve resources and peer is
          * evidently real one.
          */
-        if (inet_csk_reqsk_queue_is_full(sk) && !isn) {
+        if ((sysctl_tcp_syncookies == 2 ||
+             inet_csk_reqsk_queue_is_full(sk)) && !isn) {
                 want_cookie = tcp_syn_flood_action(sk, skb, "TCP");
                 if (!want_cookie)
                         goto drop;
@@ -1671,8 +1675,6 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
                 newtp->advmss = tcp_sk(sk)->rx_opt.user_mss;
 
         tcp_initialize_rcv_mss(newsk);
-        tcp_synack_rtt_meas(newsk, req);
-        newtp->total_retrans = req->num_retrans;
 
 #ifdef CONFIG_TCP_MD5SIG
         /* Copy over the MD5 key from the original socket */
@@ -1797,10 +1799,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
                                 sk->sk_rx_dst = NULL;
                         }
                 }
-                if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) {
-                        rsk = sk;
-                        goto reset;
-                }
+                tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len);
                 return 0;
         }
 
@@ -2605,7 +2604,7 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
         long delta = req->expires - jiffies;
 
         seq_printf(f, "%4d: %08X:%04X %08X:%04X"
-                " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
+                " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK%n",
                 i,
                 ireq->loc_addr,
                 ntohs(inet_sk(sk)->inet_sport),
@@ -2663,7 +2662,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
                 rx_queue = max_t(int, tp->rcv_nxt - tp->copied_seq, 0);
 
         seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "
-                        "%08X %5d %8d %lu %d %pK %lu %lu %u %u %d%n",
+                        "%08X %5u %8d %lu %d %pK %lu %lu %u %u %d%n",
                 i, src, srcp, dest, destp, sk->sk_state,
                 tp->write_seq - tp->snd_una,
                 rx_queue,
@@ -2802,6 +2801,7 @@ struct proto tcp_prot = {
         .unhash                 = inet_unhash,
         .get_port               = inet_csk_get_port,
         .enter_memory_pressure  = tcp_enter_memory_pressure,
+        .stream_memory_free     = tcp_stream_memory_free,
         .sockets_allocated      = &tcp_sockets_allocated,
         .orphan_count           = &tcp_orphan_count,
         .memory_allocated       = &tcp_memory_allocated,