diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2017-02-06 18:10:31 -0200 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 10:59:46 +0200 |
| commit | 219f25052f148dc57ab33ce0f7d8b9e4f28dd9cb (patch) | |
| tree | 22809466bdda32e3195a79eba6b5e6cf4d72d0ff | |
| parent | 504261abd2b3a69cb609ef9ccf4e58ae9ccad566 (diff) | |
sctp: avoid BUG_ON on sctp_wait_for_sndbuf
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.
Change-Id: I3584164c04c97bb8795f4e327f2a31e0c2b40bf9
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>
| -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 ede7c540e..152ab4be8 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -6724,7 +6724,8 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p, */ sctp_release_sock(sk); current_timeo = schedule_timeout(current_timeo); - BUG_ON(sk != asoc->base.sk); + if (sk != asoc->base.sk) + goto do_error; sctp_lock_sock(sk); *timeo_p = current_timeo; |