diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2017-02-06 18:10:31 -0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:27:27 +0000 |
| commit | 2ad78d37e15d7adba80deb103068faf6d88f95ac (patch) | |
| tree | 84fc3f7c34f0de4283fa9393aef20f6f03be5572 | |
| parent | 13508cb3bf17a73b91957e7070112b710bdfadc2 (diff) | |
| download | linux-rt-2ad78d37e15d7adba80deb103068faf6d88f95ac.tar.gz | |
sctp: avoid BUG_ON on sctp_wait_for_sndbuf
commit 2dcab598484185dea7ec22219c76dcdd59e3cb90 upstream.
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: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/sctp/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index b1c8e4591a4b..a4720b77f8c4 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -6760,7 +6760,8 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p, */ release_sock(sk); current_timeo = schedule_timeout(current_timeo); - BUG_ON(sk != asoc->base.sk); + if (sk != asoc->base.sk) + goto do_error; lock_sock(sk); *timeo_p = current_timeo; |