diff options
author | Justin M. Forbes <jforbes@redhat.com> | 2017-02-09 09:35:25 -0600 |
---|---|---|
committer | Justin M. Forbes <jforbes@redhat.com> | 2017-02-09 09:35:25 -0600 |
commit | be9b0fe86dfbc220e05c65a155316f0b52020795 (patch) | |
tree | cbe0df1beba3e0e277e1672cc641d355fdd69957 /0001-sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch | |
parent | d544d2e0418acc941bec5c321217c73de5a29ea8 (diff) | |
download | kernel-be9b0fe86dfbc220e05c65a155316f0b52020795.tar.gz kernel-be9b0fe86dfbc220e05c65a155316f0b52020795.tar.xz kernel-be9b0fe86dfbc220e05c65a155316f0b52020795.zip |
sctp: avoid BUG_ON on sctp_wait_for_sndbuf (rhbz 1420276)
Diffstat (limited to '0001-sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch')
-rw-r--r-- | 0001-sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/0001-sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch b/0001-sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch new file mode 100644 index 000000000..134e1ea39 --- /dev/null +++ b/0001-sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch @@ -0,0 +1,39 @@ +From 2dcab598484185dea7ec22219c76dcdd59e3cb90 Mon Sep 17 00:00:00 2001 +From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> +Date: Mon, 6 Feb 2017 18:10:31 -0200 +Subject: [PATCH] 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. + +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> +--- + net/sctp/socket.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/sctp/socket.c b/net/sctp/socket.c +index 37eeab7..e214d2e 100644 +--- a/net/sctp/socket.c ++++ b/net/sctp/socket.c +@@ -7426,7 +7426,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; +-- +2.9.3 + |