[PATCH net-next] sctp: change sk state to CLOSED instead of CLOSING in sctp_sock_migrate

[PATCH net-next] sctp: change sk state to CLOSED instead of CLOSING in sctp_sock_migrate

[Xin Long]

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: commit 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>
---
 net/sctp/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 6cae4c6..cdabbd8 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -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;
-- 
2.1.0

Re: [PATCH net-next] sctp: change sk state to CLOSED instead of CLOSING in sctp_sock_migrate

[Sergei Shtylyov]

Hello.

On 06/15/2016 08:15 PM, Xin Long wrote:

> 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: commit d46e416c11c8 ("sctp: sctp should change socket state when shutdown is received")

    "Commit" not needed here, this tag has well defined form.

> Reported-by: Ye Xiaolong <xiaolong.ye@intel.com>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
[...]

MBR, Sergei

Re: [PATCH net-next] sctp: change sk state to CLOSED instead of CLOSING in sctp_sock_migrate

[David Miller]

From: Xin Long <lucien.xin@gmail.com>
Date: Thu, 16 Jun 2016 01:15:06 +0800

> 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: commit 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>

Applied.

Re: [PATCH net-next] sctp: change sk state to CLOSED instead of CLOSING in sctp_sock_migrate

[marcelo.leitner]

On Thu, Jun 16, 2016 at 02:11:39PM -0700, David Miller wrote:
> From: Xin Long <lucien.xin@gmail.com>
> Date: Thu, 16 Jun 2016 01:15:06 +0800
> 
> > 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: commit 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>
> 
> Applied.

I thought Xin was going to post a version with that tag Fixed, but ok.

Patch is good to me, fwiw.

Re: [PATCH net-next] sctp: change sk state to CLOSED instead of CLOSING in sctp_sock_migrate

[David Miller]

From: marcelo.leitner@gmail.com
Date: Thu, 16 Jun 2016 18:13:22 -0300

> On Thu, Jun 16, 2016 at 02:11:39PM -0700, David Miller wrote:
>> From: Xin Long <lucien.xin@gmail.com>
>> Date: Thu, 16 Jun 2016 01:15:06 +0800
>> 
>> > 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: commit 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>
>> 
>> Applied.
> 
> I thought Xin was going to post a version with that tag Fixed, but ok.

I fixed the tag.