1 files changed, 10 insertions, 5 deletions

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 302e355f2ebc..5b932583e407 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -263,7 +263,7 @@ static int smc_bind(struct socket *sock, struct sockaddr *uaddr,
 
         /* Check if socket is already active */
         rc = -EINVAL;
-        if (sk->sk_state != SMC_INIT)
+        if (sk->sk_state != SMC_INIT || smc->connect_nonblock)
                 goto out_rel;
 
         smc->clcsock->sk->sk_reuse = sk->sk_reuse;
@@ -1390,7 +1390,8 @@ static int smc_listen(struct socket *sock, int backlog)
         lock_sock(sk);
 
         rc = -EINVAL;
-        if ((sk->sk_state != SMC_INIT) && (sk->sk_state != SMC_LISTEN))
+        if ((sk->sk_state != SMC_INIT && sk->sk_state != SMC_LISTEN) ||
+            smc->connect_nonblock)
                 goto out;
 
         rc = 0;
@@ -1518,7 +1519,7 @@ static int smc_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
                 goto out;
 
         if (msg->msg_flags & MSG_FASTOPEN) {
-                if (sk->sk_state == SMC_INIT) {
+                if (sk->sk_state == SMC_INIT && !smc->connect_nonblock) {
                         smc_switch_to_fallback(smc);
                         smc->fallback_rsn = SMC_CLC_DECL_OPTUNSUPP;
                 } else {
@@ -1732,14 +1733,18 @@ static int smc_setsockopt(struct socket *sock, int level, int optname,
                 }
                 break;
         case TCP_NODELAY:
-                if (sk->sk_state != SMC_INIT && sk->sk_state != SMC_LISTEN) {
+                if (sk->sk_state != SMC_INIT &&
+                    sk->sk_state != SMC_LISTEN &&
+                    sk->sk_state != SMC_CLOSED) {
                         if (val && !smc->use_fallback)
                                 mod_delayed_work(system_wq, &smc->conn.tx_work,
                                                  0);
                 }
                 break;
         case TCP_CORK:
-                if (sk->sk_state != SMC_INIT && sk->sk_state != SMC_LISTEN) {
+                if (sk->sk_state != SMC_INIT &&
+                    sk->sk_state != SMC_LISTEN &&
+                    sk->sk_state != SMC_CLOSED) {
                         if (!val && !smc->use_fallback)
                                 mod_delayed_work(system_wq, &smc->conn.tx_work,
                                                  0);