Skip to content

Commit dfcb9f4

Browse files
marceloleitnerdavem330
authored andcommitted
sctp: deny peeloff operation on asocs with threads sleeping on it
commit 2dcab59 ("sctp: avoid BUG_ON on sctp_wait_for_sndbuf") attempted to avoid a BUG_ON call when the association being used for a sendmsg() is blocked waiting for more sndbuf and another thread did a peeloff operation on such asoc, moving it to another socket. As Ben Hutchings noticed, then in such case it would return without locking back the socket and would cause two unlocks in a row. Further analysis also revealed that it could allow a double free if the application managed to peeloff the asoc that is created during the sendmsg call, because then sctp_sendmsg() would try to free the asoc that was created only for that call. This patch takes another approach. It will deny the peeloff operation if there is a thread sleeping on the asoc, so this situation doesn't exist anymore. This avoids the issues described above and also honors the syscalls that are already being handled (it can be multiple sendmsg calls). Joint work with Xin Long. Fixes: 2dcab59 ("sctp: avoid BUG_ON on sctp_wait_for_sndbuf") Cc: Alexander Popov <[email protected]> Cc: Ben Hutchings <[email protected]> Signed-off-by: Marcelo Ricardo Leitner <[email protected]> Signed-off-by: Xin Long <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f1ef09f commit dfcb9f4

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

net/sctp/socket.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4862,6 +4862,12 @@ int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp)
48624862
if (!asoc)
48634863
return -EINVAL;
48644864

4865+
/* If there is a thread waiting on more sndbuf space for
4866+
* sending on this asoc, it cannot be peeled.
4867+
*/
4868+
if (waitqueue_active(&asoc->wait))
4869+
return -EBUSY;
4870+
48654871
/* An association cannot be branched off from an already peeled-off
48664872
* socket, nor is this supported for tcp style sockets.
48674873
*/
@@ -7599,8 +7605,6 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p,
75997605
*/
76007606
release_sock(sk);
76017607
current_timeo = schedule_timeout(current_timeo);
7602-
if (sk != asoc->base.sk)
7603-
goto do_error;
76047608
lock_sock(sk);
76057609

76067610
*timeo_p = current_timeo;

0 commit comments

Comments
 (0)