net/smc: fix connection leak

commit 9f1c50cf39167ff71dc5953a3234f3f6eeb8fcb5 upstream.

There's a potential leak issue under following execution sequence :

smc_release  				smc_connect_work
if (sk->sk_state == SMC_INIT)
					send_clc_confirim
	tcp_abort();
					...
					sk.sk_state = SMC_ACTIVE
smc_close_active
switch(sk->sk_state) {
...
case SMC_ACTIVE:
	smc_close_final()
	// then wait peer closed

Unfortunately, tcp_abort() may discard CLC CONFIRM messages that are
still in the tcp send buffer, in which case our connection token cannot
be delivered to the server side, which means that we cannot get a
passive close message at all. Therefore, it is impossible for the to be
disconnected at all.

This patch tries a very simple way to avoid this issue, once the state
has changed to SMC_ACTIVE after tcp_abort(), we can actively abort the
smc connection, considering that the state is SMC_INIT before
tcp_abort(), abandoning the complete disconnection process should not
cause too much problem.

In fact, this problem may exist as long as the CLC CONFIRM message is
not received by the server. Whether a timer should be added after
smc_close_final() needs to be discussed in the future. But even so, this
patch provides a faster release for connection in above case, it should
also be valuable.

Fixes: 39f41f367b08 ("net/smc: common release code for non-accepted sockets")
Signed-off-by: D. Wythe <alibuda@linux.alibaba.com>
Acked-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index eff2206..5c4c032 100644 (file)
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -182,7 +182,7 @@ static int smc_release(struct socket *sock)
 {
        struct sock *sk = sock->sk;
        struct smc_sock *smc;
-       int rc = 0;
+       int old_state, rc = 0;
 
        if (!sk)
                goto out;
@@ -190,8 +190,10 @@ static int smc_release(struct socket *sock)
        sock_hold(sk); /* sock_put below */
        smc = smc_sk(sk);
 
+       old_state = sk->sk_state;
+
        /* cleanup for a dangling non-blocking connect */
-       if (smc->connect_nonblock && sk->sk_state == SMC_INIT)
+       if (smc->connect_nonblock && old_state == SMC_INIT)
                tcp_abort(smc->clcsock->sk, ECONNABORTED);
 
        if (cancel_work_sync(&smc->connect_work))
@@ -205,6 +207,10 @@ static int smc_release(struct socket *sock)
        else
                lock_sock(sk);
 
+       if (old_state == SMC_INIT && sk->sk_state == SMC_ACTIVE &&
+           !smc->use_fallback)
+               smc_close_active_abort(smc);
+
        rc = __smc_release(smc);
 
        /* detach socket */