D35123.id105680.diff
No OneTemporary
Actions

Size

853 B

Referenced Files

None

Subscribers

None

D35123.id105680.diff
View Options

	Index: sys/kern/uipc_socket.c
	===================================================================
	--- sys/kern/uipc_socket.c
	+++ sys/kern/uipc_socket.c
	@@ -1195,8 +1195,10 @@
	so->so_dtor(so);

	VNET_SO_ASSERT(so);
	- if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL)
	+ if (pr->pr_flags & PR_RIGHTS) {
	+ MPASS(pr->pr_domain->dom_dispose != NULL);
	(*pr->pr_domain->dom_dispose)(so);
	+ }
	if (pr->pr_usrreqs->pru_detach != NULL)
	(*pr->pr_usrreqs->pru_detach)(so);

	@@ -2989,8 +2991,10 @@
	* any unsafe routines (that rely on locks being initialized) on aso.
	*/
	pr = so->so_proto;
	- if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL)
	+ if (pr->pr_flags & PR_RIGHTS) {
	+ MPASS(pr->pr_domain->dom_dispose != NULL);
	(*pr->pr_domain->dom_dispose)(&aso);
	+ }
	sbrelease_internal(&aso.so_rcv, so);
	}