3 files changed, 7 insertions, 4 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 8b47a4d79d04..a5aa54ea6533 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -228,6 +228,8 @@ int inet_listen(struct socket *sock, int backlog)
                                 err = 0;
                         if (err)
                                 goto out;
+
+                        tcp_fastopen_init_key_once(true);
                 }
                 err = inet_csk_listen_start(sk, backlog);
                 if (err)
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index f1377f2a0472..bb2ce74f6004 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2545,10 +2545,13 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
 
         case TCP_FASTOPEN:
                 if (val >= 0 && ((1 << sk->sk_state) & (TCPF_CLOSE |
-                    TCPF_LISTEN)))
+                    TCPF_LISTEN))) {
+                        tcp_fastopen_init_key_once(true);
+
                         err = fastopen_init_queue(sk, val);
-                else
+                } else {
                         err = -EINVAL;
+                }
                 break;
         case TCP_TIMESTAMP:
                 if (!tp->repair)
diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c
index 46b087a27503..f9c0fb84e435 100644
--- a/net/ipv4/tcp_fastopen.c
+++ b/net/ipv4/tcp_fastopen.c
@@ -78,8 +78,6 @@ static bool __tcp_fastopen_cookie_gen(const void *path,
         struct tcp_fastopen_context *ctx;
         bool ok = false;
 
-        tcp_fastopen_init_key_once(true);
-
         rcu_read_lock();
         ctx = rcu_dereference(tcp_fastopen_ctx);
         if (ctx) {