diff options
| author | Xin Long <lucien.xin@gmail.com> | 2016-06-09 16:48:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-11 08:21:23 +0200 |
| commit | d46e416c11c88ef1deb5c7f19271806a5be597fe (patch) | |
| tree | f6918afcbeb61c64b53eb1dd2a97cf5b3ca992ac /net/sctp/sm_sideeffect.c | |
| parent | Merge tag 'mac80211-next-for-davem-2016-06-09' of git://git.kernel.org/pub/sc... (diff) | |
| download | linux-d46e416c11c88ef1deb5c7f19271806a5be597fe.tar.xz linux-d46e416c11c88ef1deb5c7f19271806a5be597fe.zip | |
sctp: sctp should change socket state when shutdown is received
Now sctp doesn't change socket state upon shutdown reception. It changes
just the assoc state, even though it's a TCP-style socket.
For some cases, if we really need to check sk->sk_state, it's necessary to
fix this issue, at least when we use ss or netstat to dump, we can get a
more exact information.
As an improvement, we will change sk->sk_state when we change asoc->state
to SHUTDOWN_RECEIVED, and also do it in sctp_shutdown to keep consistent
with sctp_close.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo R. Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_sideeffect.c')
| -rw-r--r-- | net/sctp/sm_sideeffect.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index aa3712259368..12d45193357c 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -806,8 +806,10 @@ static void sctp_cmd_new_state(sctp_cmd_seq_t *cmds, /* Set the RCV_SHUTDOWN flag when a SHUTDOWN is received. */ if (sctp_state(asoc, SHUTDOWN_RECEIVED) && - sctp_sstate(sk, ESTABLISHED)) + sctp_sstate(sk, ESTABLISHED)) { + sk->sk_state = SCTP_SS_CLOSING; sk->sk_shutdown |= RCV_SHUTDOWN; + } } if (sctp_state(asoc, COOKIE_WAIT)) { |