diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2017-02-06 18:10:31 -0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-06-17 16:12:12 +0200 |
| commit | 4e30fe9f1b5971448b4900b27211b51764186c29 (patch) | |
| tree | 8d8f99ec79d1567bda14915c605e4f402ae8be8a /net/sctp | |
| parent | 882997065a454216b64816717994aad4713fabc1 (diff) | |
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: Willy Tarreau <w@1wt.eu>
Conflicts:
net/sctp/socket.c
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 4178cf387..1df7c2fbb 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -6730,6 +6730,8 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p, */ sctp_release_sock(sk); current_timeo = schedule_timeout(current_timeo); + if (sk != asoc->base.sk) + goto do_error; sctp_lock_sock(sk); *timeo_p = current_timeo; |