From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:35084 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754986AbbFMRCS (ORCPT ); Sat, 13 Jun 2015 13:02:18 -0400 Subject: Patch "netlink: Reset portid after netlink_insert failure" has been added to the 4.0-stable tree To: herbert@gondor.apana.org.au, davem@davemloft.net, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 13 Jun 2015 10:02:17 -0700 Message-ID: <14342149377647@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled netlink: Reset portid after netlink_insert failure to the 4.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: netlink-reset-portid-after-netlink_insert-failure.patch and it can be found in the queue-4.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Sat Jun 13 09:48:35 PDT 2015 From: Herbert Xu Date: Sat, 16 May 2015 21:50:28 +0800 Subject: netlink: Reset portid after netlink_insert failure From: Herbert Xu [ Upstream commit c0bb07df7d981e4091432754e30c9c720e2c0c78 ] The commit c5adde9468b0714a051eac7f9666f23eb10b61f7 ("netlink: eliminate nl_sk_hash_lock") breaks the autobind retry mechanism because it doesn't reset portid after a failed netlink_insert. This means that should autobind fail the first time around, then the socket will be stuck in limbo as it can never be bound again since it already has a non-zero portid. Fixes: c5adde9468b0 ("netlink: eliminate nl_sk_hash_lock") Signed-off-by: Herbert Xu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/netlink/af_netlink.c | 1 + 1 file changed, 1 insertion(+) --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1069,6 +1069,7 @@ static int netlink_insert(struct sock *s err = 0; if (!__netlink_insert(table, sk)) { err = -EADDRINUSE; + nlk_sk(sk)->portid = 0; sock_put(sk); } Patches currently in stable-queue which might be from herbert@gondor.apana.org.au are queue-4.0/netlink-disable-insertions-removals-during-rehash.patch queue-4.0/netlink-reset-portid-after-netlink_insert-failure.patch