From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 08 Dec 2015 11:21:48 -0500 (EST) Message-Id: <20151208.112148.848925272627144797.davem@davemloft.net> To: herbert@gondor.apana.org.au Cc: s.priebe@profihost.ag, hannes@stressinduktion.org, fweimer@redhat.com, tglx@linutronix.de, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, j.winkel@profihost.ag, m.schinkel@profihost.ag, stable@vger.kernel.org Subject: Re: netlink: Add missing goto statement to netlink_insert From: David Miller In-Reply-To: <20151208061319.GA16209@gondor.apana.org.au> References: <20151207012042.GA7420@gondor.apana.org.au> <56652E11.4010604@profihost.ag> <20151208061319.GA16209@gondor.apana.org.au> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: From: Herbert Xu Date: Tue, 8 Dec 2015 14:13:19 +0800 > On Mon, Dec 07, 2015 at 07:58:25AM +0100, Stefan Priebe - Profihost AG wrote: >> >> Thanks, good. Can you help me to get this fix upstream into the stable >> lines? > > Sure. Greg, please apply this patch to fix up the backport for 4.1. Herbert, thanks so much for taking care of this. > ---8<--- > The backport of 1f770c0a09da855a2b51af6d19de97fb955eca85 ("netlink: > Fix autobind race condition that leads to zero port ID") missed a > goto statement, which causes netlink to break subtly. > > This was discovered by Stefan Priebe . > > Fixes: 4e2776241766 ("netlink: Fix autobind race condition that...") > Reported-by: Stefan Priebe > Reported-by: Philipp Hahn > Signed-off-by: Herbert Xu Acked-by: David S. Miller > > diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c > index d139c43..0d6038c 100644 > --- a/net/netlink/af_netlink.c > +++ b/net/netlink/af_netlink.c > @@ -1118,6 +1118,7 @@ static int netlink_insert(struct sock *sk, u32 portid) > if (err == -EEXIST) > err = -EADDRINUSE; > sock_put(sk); > + goto err; > } > > /* We need to ensure that the socket is hashed and visible. */ > > -- > Email: Herbert Xu > Home Page: http://gondor.apana.org.au/~herbert/ > PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt