netlink: Fix autobind race condition that leads to zero port ID
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 18 Sep 2015 11:16:50 +0000 (19:16 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Sep 2015 05:55:31 +0000 (22:55 -0700)
commit1f770c0a09da855a2b51af6d19de97fb955eca85
treeeeb43c3ce6917390ce6e55b48990d2ba32aaf9cc
parent3ea79249e81e5ed051f2e6480cbde896d99046e8
netlink: Fix autobind race condition that leads to zero port ID

The commit c0bb07df7d981e4091432754e30c9c720e2c0c78 ("netlink:
Reset portid after netlink_insert failure") introduced a race
condition where if two threads try to autobind the same socket
one of them may end up with a zero port ID.  This led to kernel
deadlocks that were observed by multiple people.

This patch reverts that commit and instead fixes it by introducing
a separte rhash_portid variable so that the real portid is only set
after the socket has been successfully hashed.

Fixes: c0bb07df7d98 ("netlink: Reset portid after netlink_insert failure")
Reported-by: Tejun Heo <tj@kernel.org>
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netlink/af_netlink.c
net/netlink/af_netlink.h