sctp: assign assoc_id earlier in __sctp_connect
authorMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Thu, 3 Nov 2016 19:03:41 +0000 (17:03 -0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Nov 2016 18:18:37 +0000 (13:18 -0500)
commit7233bc84a3aeda835d334499dc00448373caf5c0
tree80684f77226940c66a814c3ab55155fd9f87e845
parentee0475a5fc1a02115bf0df9207d4bb6c1abf7db1
sctp: assign assoc_id earlier in __sctp_connect

sctp_wait_for_connect() currently already holds the asoc to keep it
alive during the sleep, in case another thread release it. But Andrey
Konovalov and Dmitry Vyukov reported an use-after-free in such
situation.

Problem is that __sctp_connect() doesn't get a ref on the asoc and will
do a read on the asoc after calling sctp_wait_for_connect(), but by then
another thread may have closed it and the _put on sctp_wait_for_connect
will actually release it, causing the use-after-free.

Fix is, instead of doing the read after waiting for the connect, do it
before so, and avoid this issue as the socket is still locked by then.
There should be no issue on returning the asoc id in case of failure as
the application shouldn't trust on that number in such situations
anyway.

This issue doesn't exist in sctp_sendmsg() path.

Reported-by: Dmitry Vyukov <dvyukov@google.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Reviewed-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/socket.c