1 files changed, 8 insertions, 12 deletions

diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c
index ea82fd492c1b..e3d87aca6be8 100644
--- a/net/ipv4/tcp_fastopen.c
+++ b/net/ipv4/tcp_fastopen.c
@@ -141,7 +141,7 @@ static bool tcp_fastopen_create_child(struct sock *sk,
         req->sk = NULL;
 
         child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb, req, NULL);
-        if (child == NULL)
+        if (!child)
                 return false;
 
         spin_lock(&queue->fastopenq->lock);
@@ -155,12 +155,7 @@ static bool tcp_fastopen_create_child(struct sock *sk,
         tp = tcp_sk(child);
 
         tp->fastopen_rsk = req;
-        /* Do a hold on the listner sk so that if the listener is being
-         * closed, the child that has been accepted can live on and still
-         * access listen_lock.
-         */
-        sock_hold(sk);
-        tcp_rsk(req)->listener = sk;
+        tcp_rsk(req)->tfo_listener = true;
 
         /* RFC1323: The window in SYN & SYN/ACK segments is never
          * scaled. So correct it appropriately.
@@ -174,6 +169,7 @@ static bool tcp_fastopen_create_child(struct sock *sk,
         inet_csk_reset_xmit_timer(child, ICSK_TIME_RETRANS,
                                   TCP_TIMEOUT_INIT, TCP_RTO_MAX);
 
+        atomic_set(&req->rsk_refcnt, 1);
         /* Add the child socket directly into the accept queue */
         inet_csk_reqsk_queue_add(sk, req, child);
 
@@ -218,10 +214,9 @@ static bool tcp_fastopen_create_child(struct sock *sk,
         sk->sk_data_ready(sk);
         bh_unlock_sock(child);
         sock_put(child);
-        WARN_ON(req->sk == NULL);
+        WARN_ON(!req->sk);
         return true;
 }
-EXPORT_SYMBOL(tcp_fastopen_create_child);
 
 static bool tcp_fastopen_queue_check(struct sock *sk)
 {
@@ -238,14 +233,14 @@ static bool tcp_fastopen_queue_check(struct sock *sk)
          * temporarily vs a server not supporting Fast Open at all.
          */
         fastopenq = inet_csk(sk)->icsk_accept_queue.fastopenq;
-        if (fastopenq == NULL || fastopenq->max_qlen == 0)
+        if (!fastopenq || fastopenq->max_qlen == 0)
                 return false;
 
         if (fastopenq->qlen >= fastopenq->max_qlen) {
                 struct request_sock *req1;
                 spin_lock(&fastopenq->lock);
                 req1 = fastopenq->rskq_rst_head;
-                if ((req1 == NULL) || time_after(req1->expires, jiffies)) {
+                if (!req1 || time_after(req1->rsk_timer.expires, jiffies)) {
                         spin_unlock(&fastopenq->lock);
                         NET_INC_STATS_BH(sock_net(sk),
                                          LINUX_MIB_TCPFASTOPENLISTENOVERFLOW);
@@ -254,7 +249,7 @@ static bool tcp_fastopen_queue_check(struct sock *sk)
                 fastopenq->rskq_rst_head = req1->dl_next;
                 fastopenq->qlen--;
                 spin_unlock(&fastopenq->lock);
-                reqsk_free(req1);
+                reqsk_put(req1);
         }
         return true;
 }
@@ -308,6 +303,7 @@ fastopen:
         } else if (foc->len > 0) /* Client presents an invalid cookie */
                 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPFASTOPENPASSIVEFAIL);
 
+        valid_foc.exp = foc->exp;
         *foc = valid_foc;
         return false;
 }