diff options
| author | Ursula Braun <ubraun@linux.ibm.com> | 2019-02-04 13:44:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-04 09:11:19 -0800 |
| commit | 84b799a292ebc03de388f8573a169de6eb12c340 (patch) | |
| tree | f49331673908a7f6d271c643a9203db7fd106d92 /net/smc | |
| parent | a5e04318c83a31925300af1ce358dbc1a708b732 (diff) | |
| download | linux-84b799a292ebc03de388f8573a169de6eb12c340.tar.bz2 | |
net/smc: correct state change for peer closing
If some kind of closing is received from the peer while still in
state SMC_INIT, it means the peer has had an active connection and
closed the socket quickly before listen_work finished. This should
not result in a shortcut from state SMC_INIT to state SMC_CLOSED.
This patch adds the socket to the accept queue in state
SMC_APPCLOSEWAIT1. The socket reaches state SMC_CLOSED once being
accepted and closed with smc_release().
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc')
| -rw-r--r-- | net/smc/smc_close.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/smc/smc_close.c b/net/smc/smc_close.c index ea2b87f29469..e39cadda1bf5 100644 --- a/net/smc/smc_close.c +++ b/net/smc/smc_close.c @@ -345,14 +345,7 @@ static void smc_close_passive_work(struct work_struct *work) switch (sk->sk_state) { case SMC_INIT: - if (atomic_read(&conn->bytes_to_rcv) || - (rxflags->peer_done_writing && - !smc_cdc_rxed_any_close(conn))) { - sk->sk_state = SMC_APPCLOSEWAIT1; - } else { - sk->sk_state = SMC_CLOSED; - sock_put(sk); /* passive closing */ - } + sk->sk_state = SMC_APPCLOSEWAIT1; break; case SMC_ACTIVE: sk->sk_state = SMC_APPCLOSEWAIT1; |