From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 8 Dec 2015 06:13:19 +0000 (+0800)
Subject: netlink: Add missing goto statement to netlink_insert
X-Git-Tag: v4.1.12-92~201^2~40
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9a2ba29a2a48d5b5c69223fcdc49611594ed0a5c;p=users%2Fjedix%2Flinux-maple.git

netlink: Add missing goto statement to netlink_insert

Orabug: 22623854

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>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry picked from commit a52ec6de6d1638e8c203d7188c55627f75371612)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index b829472767b94..ad2ac9e6675b3 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1119,6 +1119,7 @@ static int netlink_insert(struct sock *sk, u32 portid)
 			err = -EADDRINUSE;
 		nlk_sk(sk)->portid = 0;
 		sock_put(sk);
+		goto err;
 	}
 
 err: