nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

netlink: Reset portid after netlink_insert failure

Browse source 
The commit c5adde9468 ("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: c5adde9468 ("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>
This commit is contained in:
Herbert Xu 2015-05-16 21:50:28 +08:00 committed by David S. Miller
parent 1d6057019e
commit c0bb07df7d
1 changed files with 1 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
net/netlink/af_netlink.c
View file

@ -1081,6 +1081,7 @@ static int netlink_insert(struct sock *sk, u32 portid)
if (err) { if (err) {
if (err == -EEXIST) if (err == -EEXIST)
err = -EADDRINUSE; err = -EADDRINUSE;
nlk_sk(sk)->portid = 0;
sock_put(sk); sock_put(sk);
} }