diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2017-02-06 18:10:31 -0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-18 07:55:44 +0200 |
| commit | a4a3d26a1d4e0702b1b54c8dc9c56ed61742568a (patch) | |
| tree | a2e87c10d52d5ec433b8291d4a31f46ca69c3063 /net/sctp | |
| parent | 5493088fc112385a70a0c77c3fd37dfb78cc02d6 (diff) | |
| download | linux-stable-a4a3d26a1d4e0702b1b54c8dc9c56ed61742568a.tar.gz linux-stable-a4a3d26a1d4e0702b1b54c8dc9c56ed61742568a.tar.bz2 linux-stable-a4a3d26a1d4e0702b1b54c8dc9c56ed61742568a.zip | |
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sctp')
| -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 72da7d58ccca..0c41dbb5bdf6 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -6962,7 +6962,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; |