D15393.diff
No OneTemporary
Actions

Size

988 B

Referenced Files

None

Subscribers

None

D15393.diff
View Options

	Index: head/sys/netinet/in_mcast.c
	===================================================================
	--- head/sys/netinet/in_mcast.c
	+++ head/sys/netinet/in_mcast.c
	@@ -2501,6 +2501,8 @@
	/*
	* Begin state merge transaction at IGMP layer.
	*/
	+ in_pcbref(inp);
	+ INP_WUNLOCK(inp);
	IN_MULTI_LOCK();

	if (is_final) {
	@@ -2531,6 +2533,9 @@
	out_in_multi_locked:

	IN_MULTI_UNLOCK();
	+ INP_WLOCK(inp);
	+ if (in_pcbrele_wlocked(inp))
	+ return (ENXIO);

	if (error)
	imf_rollback(imf);
	Index: head/sys/netinet6/in6_mcast.c
	===================================================================
	--- head/sys/netinet6/in6_mcast.c
	+++ head/sys/netinet6/in6_mcast.c
	@@ -2381,6 +2381,8 @@
	/*
	* Begin state merge transaction at MLD layer.
	*/
	+ in_pcbref(inp);
	+ INP_WUNLOCK(inp);
	IN6_MULTI_LOCK();

	if (is_final) {
	@@ -2407,6 +2409,9 @@
	}

	IN6_MULTI_UNLOCK();
	+ INP_WLOCK(inp);
	+ if (in_pcbrele_wlocked(inp))
	+ return (ENXIO);

	if (error)
	im6f_rollback(imf);