Skip to content

Commit a4226c7

Browse files
marceloleitnergregkh
authored andcommitted
sctp: avoid BUG_ON on sctp_wait_for_sndbuf
[ Upstream commit 2dcab598484185dea7ec22219c76dcdd59e3cb90 ] Alexander Popov reported that an application may trigger a BUG_ON in sctp_wait_for_sndbuf if the socket tx buffer is full, a thread is waiting on it to queue more data and meanwhile another thread peels off the association being used by the first thread. This patch replaces the BUG_ON call with a proper error handling. It will return -EPIPE to the original sendmsg call, similarly to what would have been done if the association wasn't found in the first place. Acked-by: Alexander Popov <alex.popov@linux.com> Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Reviewed-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f46f344 commit a4226c7

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

net/sctp/socket.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6960,7 +6960,8 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p,
69606960
*/
69616961
release_sock(sk);
69626962
current_timeo = schedule_timeout(current_timeo);
6963-
BUG_ON(sk != asoc->base.sk);
6963+
if (sk != asoc->base.sk)
6964+
goto do_error;
69646965
lock_sock(sk);
69656966

69666967
*timeo_p = current_timeo;

0 commit comments

Comments
 (0)