net/smc: destruct non-accepted sockets

Make sure sockets never accepted are removed cleanly.

Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Reviewed-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 491a8b2b8b89107f016b72958b577cee5acd08ba..5b6ee21368a68b4c02a5b8987a09a6d6ee613a0e 100644 (file)
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -638,7 +638,8 @@ struct sock *smc_accept_dequeue(struct sock *parent,
 
                smc_accept_unlink(new_sk);
                if (new_sk->sk_state == SMC_CLOSED) {
-                       /* tbd in follow-on patch: close this sock */
+                       new_sk->sk_prot->unhash(new_sk);
+                       sock_put(new_sk);
                        continue;
                }
                if (new_sock)
@@ -658,8 +659,13 @@ void smc_close_non_accepted(struct sock *sk)
        if (!sk->sk_lingertime)
                /* wait for peer closing */
                sk->sk_lingertime = SMC_MAX_STREAM_WAIT_TIMEOUT;
-       if (!smc->use_fallback)
+       if (smc->use_fallback) {
+               sk->sk_state = SMC_CLOSED;
+       } else {
                smc_close_active(smc);
+               sock_set_flag(sk, SOCK_DEAD);
+               sk->sk_shutdown |= SHUTDOWN_MASK;
+       }
        if (smc->clcsock) {
                struct socket *tcp;
 
@@ -667,11 +673,9 @@ void smc_close_non_accepted(struct sock *sk)
                smc->clcsock = NULL;
                sock_release(tcp);
        }
-       sock_set_flag(sk, SOCK_DEAD);
-       sk->sk_shutdown |= SHUTDOWN_MASK;
        if (smc->use_fallback) {
                schedule_delayed_work(&smc->sock_put_work, TCP_TIMEWAIT_LEN);
-       } else {
+       } else if (sk->sk_state == SMC_CLOSED) {
                smc_conn_free(&smc->conn);
                schedule_delayed_work(&smc->sock_put_work,
                                      SMC_CLOSE_SOCK_PUT_DELAY);

diff --git a/net/smc/smc_close.c b/net/smc/smc_close.c
index 9070720b6d1aba4eb4713dab8559d15919c867f6..3c2e166b5d222f4c932179ae442cbd88969efc92 100644 (file)
--- a/net/smc/smc_close.c
+++ b/net/smc/smc_close.c
@@ -191,7 +191,6 @@ again:
                sk->sk_state = SMC_CLOSED;
                if (smc->smc_listen_work.func)
                        cancel_work_sync(&smc->smc_listen_work);
-               sock_put(sk);
                break;
        case SMC_LISTEN:
                sk->sk_state = SMC_CLOSED;