From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753219AbdBUQJG (ORCPT ); Tue, 21 Feb 2017 11:09:06 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:37230 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751867AbdBUQI6 (ORCPT ); Tue, 21 Feb 2017 11:08:58 -0500 Message-ID: <1487693324.2885.17.camel@decadent.org.uk> Subject: Re: [PATCH 4.4 14/20] sctp: avoid BUG_ON on sctp_wait_for_sndbuf From: Ben Hutchings To: Alexander Popov , Marcelo Ricardo Leitner , Xin Long Cc: stable@vger.kernel.org, "David S. Miller" , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Date: Tue, 21 Feb 2017 16:08:44 +0000 In-Reply-To: <20170216175300.120096888@linuxfoundation.org> References: <20170216175259.514980415@linuxfoundation.org> <20170216175300.120096888@linuxfoundation.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-mrYwhYxLlx3014JQJle7" X-Mailer: Evolution 3.22.4-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 82.70.136.246 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-mrYwhYxLlx3014JQJle7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2017-02-16 at 09:53 -0800, Greg Kroah-Hartman wrote: > 4.4-stable review patch.=C2=A0=C2=A0If anyone has any objections, please = let me know. >=20 > ------------------ >=20 > From: Marcelo Ricardo Leitner >=20 >=20 > [ Upstream commit 2dcab598484185dea7ec22219c76dcdd59e3cb90 ] [...] > --- a/net/sctp/socket.c > +++ b/net/sctp/socket.c > @@ -6960,7 +6960,8 @@ static int sctp_wait_for_sndbuf(struct s > =C2=A0 =C2=A0*/ > =C2=A0 release_sock(sk); > =C2=A0 current_timeo =3D schedule_timeout(current_timeo); > - BUG_ON(sk !=3D asoc->base.sk); > + if (sk !=3D asoc->base.sk) > + goto do_error; This function normally returns with sk still locked, but in this case it returns with sk unlocked. Perhaps this check should be moved after the lock_sock(sk)? Ben. > =C2=A0 lock_sock(sk); > =C2=A0 > =C2=A0 *timeo_p =3D current_timeo; >=20 >=20 --=20 Ben Hutchings 73.46% of all statistics are made up. --=-mrYwhYxLlx3014JQJle7 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAlisZgwACgkQ57/I7JWG EQloqQ/9FudhZamtj2bhFTepSovt60cmfZXklC/3sBjhu2TwHgyZ81sxljb61kHN x8ydHJBdJZ4Xxb/LUxGBKTUBrnxDJf+SjAvu+919UcqgC8cZTFueR5itTRipYFL6 iTfEIU6JDR0oin3SLdckwLEdJD7zqgYc8Ti0ko+aHHA9tTnPVjM/i20Ck/EnQbM7 g7E1hCkkWx5J/MuaS++dz0acEDYLv6u4oTp6YNX3tHOIYtfShZrhsPonLKyp4Twi ZZufkB+5alI3S3d2wmPyYHLfeZukEkxJBu89coQfSfu0W+9RxUs9jWA0ullpg2y7 te+v4bZCDZfmMxDFXN3+NexR4vqGJKDtnaa7PPARxmCJzbUlmDIP1sCiImJL3McN h3IXy7MfIoHgraaSYZoh0NPzYzV3inwo+gfaqd3TxpY3Bx+yILaSMGrCjk5Cr1gp KFXdMlGl082yGUjDPgpHyCeDO84oIUFloOvPzQ7tPWtnoqX1xn3BJ057ToQ3nfVx 7++nzEkR6pzn4V4vlR8vNI4nZgohzj0/xivDhPyGykB++NsoMnZpDJBGfkkAHt7l exn3N0EFetRrfhcuYiXUFycER7PZ6wogpwLILylMsaV/PNuR1W8fbTAaJjaDgq1A lBe92ZB53jVWY+DF4nsGhBWB/rVHjP6qMyRRjGTUon5+W/L1DOE= =yBrJ -----END PGP SIGNATURE----- --=-mrYwhYxLlx3014JQJle7--