D20936.diff
No OneTemporary
Actions

Size

1015 B

Referenced Files

None

Subscribers

None

D20936.diff
View Options

	Index: head/sys/netinet6/udp6_usrreq.c
	===================================================================
	--- head/sys/netinet6/udp6_usrreq.c
	+++ head/sys/netinet6/udp6_usrreq.c
	@@ -742,9 +742,24 @@
	* - when we are not bound to an address and source port (it is
	* in6_pcbsetport() which will require the write lock).
	*/
	+retry:
	if (sin6 == NULL \|\| (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr) &&
	inp->inp_lport == 0)) {
	INP_WLOCK(inp);
	+ /*
	+ * In case we lost a race and another thread bound addr/port
	+ * on the inp we cannot keep the wlock (which still would be
	+ * fine) as further down, based on these values we make
	+ * decisions for the pcbinfo lock. If the locks are not in
	+ * synch the assertions on unlock will fire, hence we go for
	+ * one retry loop.
	+ */
	+ if (sin6 != NULL &&
	+ (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr) \|\|
	+ inp->inp_lport != 0)) {
	+ INP_WUNLOCK(inp);
	+ goto retry;
	+ }
	unlock_inp = UH_WLOCKED;
	} else {
	INP_RLOCK(inp);