All of lore.kernel.org
 help / color / mirror / Atom feed
From: Herbert Xu <herbert@gondor.apana.org.au>
To: David Miller <davem@redhat.com>
Cc: eric.dumazet@gmail.com, tgraf@suug.ch, netdev@vger.kernel.org,
	ying.xue@windriver.com
Subject: [net] netlink: Reset portid after netlink_insert failure
Date: Sat, 16 May 2015 21:50:28 +0800	[thread overview]
Message-ID: <20150516135028.GA1271@gondor.apana.org.au> (raw)
In-Reply-To: <20150516134007.GA1152@gondor.apana.org.au>

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 <herbert@gondor.apana.org.au>

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 6ffce5b..d2a4438 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1081,6 +1081,7 @@ static int netlink_insert(struct sock *sk, u32 portid)
 	if (err) {
 		if (err == -EEXIST)
 			err = -EADDRINUSE;
+		nlk_sk(sk)->portid = 0;
 		sock_put(sk);
 	}
 
-- 
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

  reply	other threads:[~2015-05-16 13:50 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-13  5:30 netlink & rhashtable status Eric Dumazet
2015-05-13  5:40 ` Herbert Xu
2015-05-13  6:15   ` Eric Dumazet
2015-05-13  6:20     ` Herbert Xu
2015-05-13 13:04       ` Eric Dumazet
2015-05-13 16:18         ` Eric Dumazet
2015-05-13 16:35           ` David Miller
2015-05-14  2:55             ` Herbert Xu
2015-05-14  2:53           ` Herbert Xu
2015-05-14  3:17             ` Eric Dumazet
2015-05-14  3:34               ` Herbert Xu
2015-05-14  3:58                 ` Eric Dumazet
2015-05-14  4:13                   ` Eric Dumazet
2015-05-14  4:16                     ` Herbert Xu
2015-05-14  4:21                       ` Herbert Xu
2015-05-14  4:38                         ` Eric Dumazet
2015-05-14  5:03                           ` Herbert Xu
2015-05-14  5:56                         ` Red Hat INTERNAL-ONLY kernel discussion list <rhkernel-list@redhat.com> Herbert Xu
2015-05-14  5:58                         ` netlink: Disable insertions/removals during rehash Herbert Xu
2015-05-14  6:02                           ` netlink: Kill bogus lock_sock in netlink_insert Herbert Xu
2015-05-15 16:49                             ` David Miller
2015-05-15 18:01                               ` Eric Dumazet
2015-05-16 16:50                                 ` Eric Dumazet
2015-05-16 20:58                                   ` David Miller
2015-05-15 17:02                             ` David Miller
2015-05-16 12:32                               ` Herbert Xu
2015-05-16 13:40                                 ` [net] netlink: Make autobind rover an atomic_t Herbert Xu
2015-05-16 13:50                                   ` Herbert Xu [this message]
2015-05-16 21:09                                     ` [net] netlink: Reset portid after netlink_insert failure David Miller
2015-05-16 21:08                                   ` [net] netlink: Make autobind rover an atomic_t David Miller
2015-05-17  2:45                                     ` [net-next] netlink: Use random autobind rover Herbert Xu
2015-05-18  3:44                                       ` David Miller
2015-05-14 14:37                           ` netlink: Disable insertions/removals during rehash Eric Dumazet
2015-05-15  0:06                             ` Herbert Xu
2015-05-20 23:53                               ` Thomas Graf
2015-05-21  0:31                                 ` Eric Dumazet
2015-05-15 17:02                           ` David Miller
2015-05-16 13:16                             ` Herbert Xu
2015-05-16 21:10                               ` David Miller
2015-06-04 16:27                                 ` Guenter Roeck
2015-06-04 18:59                                   ` David Miller
2015-06-04 20:44                                     ` Eric Dumazet
2015-06-04 20:58                                     ` Guenter Roeck
2015-06-05  3:52                                   ` Herbert Xu
2015-06-05  5:27                                     ` Guenter Roeck
2015-06-26 10:44                         ` netlink & rhashtable status Konstantin Khlebnikov
2015-06-27  7:09                           ` Herbert Xu
2015-05-14  4:17                     ` Eric Dumazet

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=20150516135028.GA1271@gondor.apana.org.au \
    --to=herbert@gondor.apana.org.au \
    --cc=davem@redhat.com \
    --cc=eric.dumazet@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=tgraf@suug.ch \
    --cc=ying.xue@windriver.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.