Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 288c8390 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

net/smc: destruct non-accepted sockets 



Make sure sockets never accepted are removed cleanly.

Signed-off-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f5227cd9

net/smc/af_smc.c

+9 −5
Original line number Diff line number Diff line
@@ -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);

net/smc/smc_close.c

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ int smc_close_active(struct smc_sock *smc) 
		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;