Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755206AbdDQUBC (ORCPT ); Mon, 17 Apr 2017 16:01:02 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:35653 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753434AbdDQUA7 (ORCPT ); Mon, 17 Apr 2017 16:00:59 -0400 Subject: Re: [PATCH 3.18 010/145] sctp: avoid BUG_ON on sctp_wait_for_sndbuf To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Alexander Popov , Xin Long , "David S. Miller" References: <20170416080200.205458595@linuxfoundation.org> <20170416080200.741306713@linuxfoundation.org> From: Marcelo Ricardo Leitner Message-ID: Date: Mon, 17 Apr 2017 17:00:50 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0 MIME-Version: 1.0 In-Reply-To: <20170416080200.741306713@linuxfoundation.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1758 Lines: 51 Em 16-04-2017 07:48, Greg Kroah-Hartman escreveu: > 3.18-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Marcelo Ricardo Leitner > > > [ Upstream commit 2dcab598484185dea7ec22219c76dcdd59e3cb90 ] Hi Greg. Are you also including dfcb9f4f99f1 ("sctp: deny peeloff operation on asocs with threads sleeping on it") It's a follow-up fix for this one, would be good to have it too. > > 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 > Signed-off-by: Marcelo Ricardo Leitner > Reviewed-by: Xin Long > Signed-off-by: David S. Miller > Signed-off-by: Greg Kroah-Hartman > Signed-off-by: Greg Kroah-Hartman > --- > net/sctp/socket.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > --- a/net/sctp/socket.c > +++ b/net/sctp/socket.c > @@ -6962,7 +6962,8 @@ static int sctp_wait_for_sndbuf(struct s > */ > 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; > >