From: Herbert Xu <herbert@gondor.apana.org.au>
To: Stefan Priebe - Profihost AG <s.priebe@profihost.ag>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>,
Florian Weimer <fweimer@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org,
jannik Winkel <j.winkel@profihost.ag>,
Marco Schinkel <m.schinkel@profihost.ag>,
"David S. Miller" <davem@davemloft.net>,
stable@vger.kernel.org
Subject: netlink: Add missing goto statement to netlink_insert
Date: Tue, 8 Dec 2015 14:13:19 +0800 [thread overview]
Message-ID: <20151208061319.GA16209@gondor.apana.org.au> (raw)
In-Reply-To: <56652E11.4010604@profihost.ag>
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.
---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 <s.priebe@profihost.ag>.
Fixes: 4e2776241766 ("netlink: Fix autobind race condition that...")
Reported-by: Stefan Priebe <s.priebe@profihost.ag>
Reported-by: Philipp Hahn <pmhahn@pmhahn.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
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 <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
next prev parent reply other threads:[~2015-12-08 6:13 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-17 14:44 Asterisk deadlocks since Kernel 4.1 Stefan Priebe - Profihost AG
2015-11-17 19:15 ` Thomas Gleixner
2015-11-17 19:27 ` Stefan Priebe
2015-11-17 19:43 ` Thomas Gleixner
2015-11-18 20:23 ` Stefan Priebe
2015-11-18 21:00 ` Hannes Frederic Sowa
2015-11-18 21:20 ` Stefan Priebe
2015-11-18 21:22 ` Hannes Frederic Sowa
2015-11-19 9:35 ` Stefan Priebe - Profihost AG
2015-11-18 21:18 ` Florian Weimer
2015-11-18 21:23 ` Stefan Priebe
2015-11-19 9:39 ` Florian Weimer
2015-11-18 21:36 ` Stefan Priebe
2015-11-18 21:40 ` Hannes Frederic Sowa
2015-11-18 21:42 ` Stefan Priebe
2015-11-18 21:58 ` Hannes Frederic Sowa
2015-11-19 9:44 ` Florian Weimer
2015-11-19 9:49 ` Stefan Priebe - Profihost AG
2015-11-19 9:56 ` Stefan Priebe - Profihost AG
2015-11-19 11:41 ` Hannes Frederic Sowa
2015-11-19 11:43 ` Stefan Priebe - Profihost AG
2015-11-19 12:41 ` Hannes Frederic Sowa
2015-11-19 12:46 ` Stefan Priebe - Profihost AG
2015-11-19 13:19 ` Florian Weimer
2015-11-19 19:51 ` Stefan Priebe
2015-11-23 12:44 ` Stefan Priebe - Profihost AG
2015-11-23 12:57 ` Hannes Frederic Sowa
2015-11-24 13:35 ` Stefan Priebe - Profihost AG
2015-12-02 9:45 ` Stefan Priebe - Profihost AG
2015-12-02 11:40 ` Hannes Frederic Sowa
2015-12-02 17:51 ` Philipp Hahn
2015-12-03 8:23 ` Stefan Priebe - Profihost AG
2015-12-04 18:26 ` Stefan Priebe
2015-12-05 1:08 ` Herbert Xu
2015-12-06 20:56 ` Stefan Priebe
2015-12-07 1:20 ` Herbert Xu
2015-12-07 6:58 ` Stefan Priebe - Profihost AG
2015-12-08 6:13 ` Herbert Xu [this message]
2015-12-08 16:21 ` netlink: Add missing goto statement to netlink_insert David Miller
2015-12-09 3:29 ` Greg KH
2015-12-07 7:41 ` Asterisk deadlocks since Kernel 4.1 Philipp Hahn
2015-12-05 14:19 ` Philipp Matthias Hahn
2015-12-05 15:34 ` Stefan Priebe
2015-12-02 17:15 ` Philipp Hahn
2015-12-02 18:23 ` Hannes Frederic Sowa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151208061319.GA16209@gondor.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=davem@davemloft.net \
--cc=fweimer@redhat.com \
--cc=hannes@stressinduktion.org \
--cc=j.winkel@profihost.ag \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.schinkel@profihost.ag \
--cc=netdev@vger.kernel.org \
--cc=s.priebe@profihost.ag \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).