sctp: change sk state to CLOSED instead of CLOSING in sctp_sock_migrate
authorXin Long <lucien.xin@gmail.com>
Wed, 15 Jun 2016 17:15:06 +0000 (01:15 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Jun 2016 21:10:44 +0000 (14:10 -0700)
Commit d46e416c11c8 ("sctp: sctp should change socket state when
shutdown is received") may set sk_state CLOSING in sctp_sock_migrate,
but inet_accept doesn't allow the sk_state other than ESTABLISHED/
CLOSED for sctp. So we will change sk_state to CLOSED, instead of
CLOSING, as actually sk is closed already there.

Fixes: d46e416c11c8 ("sctp: sctp should change socket state when shutdown is received")
Reported-by: Ye Xiaolong <xiaolong.ye@intel.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/socket.c

index 6cae4c61ae265746fa7a404b58941d76cc1eecf7..cdabbd8219b1bd56a6b7e9eb10cae92371fe7fa8 100644 (file)
@@ -7568,7 +7568,7 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
         * is called, set RCV_SHUTDOWN flag.
         */
        if (sctp_state(assoc, CLOSED) && sctp_style(newsk, TCP)) {
-               newsk->sk_state = SCTP_SS_CLOSING;
+               newsk->sk_state = SCTP_SS_CLOSED;
                newsk->sk_shutdown |= RCV_SHUTDOWN;
        } else {
                newsk->sk_state = SCTP_SS_ESTABLISHED;