diff options
| author | Ursula Braun <ubraun@linux.vnet.ibm.com> | 2018-01-25 11:15:32 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-25 22:10:42 +0100 |
| commit | 5ac92a00aa743e76e86503d58f092830486af39b (patch) | |
| tree | 23d050891785ea6e00b0677d6df569b048a44031 /net/smc/smc_close.c | |
| parent | net/smc: cancel tx worker in case of socket aborts (diff) | |
| download | linux-5ac92a00aa743e76e86503d58f092830486af39b.tar.xz linux-5ac92a00aa743e76e86503d58f092830486af39b.zip | |
net/smc: handle state SMC_PEERFINCLOSEWAIT correctly
A state transition from closing state SMC_PEERFINCLOSEWAIT to closing
state SMC_APPFINCLOSEWAIT is not allowed. Once a closing indication
from the peer has been received, the socket reaches state SMC_CLOSED.
And receiving a peer_conn_abort just changes the state of the socket
into one of the states SMC_PROCESSABORT or SMC_CLOSED;
sending a peer_conn_abort occurs in smc_close_active() for state
SMC_PROCESSABORT only.
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_close.c')
| -rw-r--r-- | net/smc/smc_close.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/smc/smc_close.c b/net/smc/smc_close.c index 6de909612bd0..3dc109f5db56 100644 --- a/net/smc/smc_close.c +++ b/net/smc/smc_close.c @@ -280,7 +280,6 @@ static void smc_close_passive_abort_received(struct smc_sock *smc) case SMC_APPFINCLOSEWAIT: case SMC_APPCLOSEWAIT1: case SMC_APPCLOSEWAIT2: - smc_close_abort(&smc->conn); sk->sk_state = SMC_PROCESSABORT; break; case SMC_PEERCLOSEWAIT1: @@ -288,7 +287,6 @@ static void smc_close_passive_abort_received(struct smc_sock *smc) if (txflags->peer_done_writing && !smc_close_sent_any_close(&smc->conn)) { /* just shutdown, but not yet closed locally */ - smc_close_abort(&smc->conn); sk->sk_state = SMC_PROCESSABORT; } else { sk->sk_state = SMC_CLOSED; @@ -354,7 +352,6 @@ static void smc_close_passive_work(struct work_struct *work) /* fall through */ /* to check for closing */ case SMC_PEERCLOSEWAIT2: - case SMC_PEERFINCLOSEWAIT: if (!smc_cdc_rxed_any_close(conn)) break; if (sock_flag(sk, SOCK_DEAD) && @@ -366,6 +363,10 @@ static void smc_close_passive_work(struct work_struct *work) sk->sk_state = SMC_APPFINCLOSEWAIT; } break; + case SMC_PEERFINCLOSEWAIT: + if (smc_cdc_rxed_any_close(conn)) + sk->sk_state = SMC_CLOSED; + break; case SMC_APPCLOSEWAIT1: case SMC_APPCLOSEWAIT2: case SMC_APPFINCLOSEWAIT: |