diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-16 15:50:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-16 23:08:57 +0200 |
| commit | c0bb07df7d981e4091432754e30c9c720e2c0c78 (patch) | |
| tree | f2d676b046893d451555345d93a1bc72af18c2c6 /net/netlink/af_netlink.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (diff) | |
| download | linux-c0bb07df7d981e4091432754e30c9c720e2c0c78.tar.xz linux-c0bb07df7d981e4091432754e30c9c720e2c0c78.zip | |
netlink: Reset portid after netlink_insert failure
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink/af_netlink.c')
| -rw-r--r-- | net/netlink/af_netlink.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index dbe885901b34..bf6e76643f78 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); } |