]> git.baikalelectronics.ru Git - kernel.git/commit
sctp: change sk state only when it has assocs in sctp_shutdown
authorXin Long <lucien.xin@gmail.com>
Sun, 13 Nov 2016 13:44:37 +0000 (21:44 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Nov 2016 21:22:33 +0000 (16:22 -0500)
commite64de9cb52cdef5fb78a9eb285c02afa67170109
tree0482e404f2e9307e27224e6ffc660c59d34325b9
parentae8e3b73d868efd0b5b5f4037ec0afb97a2cba26
sctp: change sk state only when it has assocs in sctp_shutdown

Now when users shutdown a sock with SEND_SHUTDOWN in sctp, even if
this sock has no connection (assoc), sk state would be changed to
SCTP_SS_CLOSING, which is not as we expect.

Besides, after that if users try to listen on this sock, kernel
could even panic when it dereference sctp_sk(sk)->bind_hash in
sctp_inet_listen, as bind_hash is null when sock has no assoc.

This patch is to move sk state change after checking sk assocs
is not empty, and also merge these two if() conditions and reduce
indent level.

Fixes: da9339344cda ("sctp: sctp should change socket state when shutdown is received")
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/socket.c