D57555.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D57555.diff
View Options

	diff --git a/sys/rpc/rpcsec_tls/rpctls_impl.c b/sys/rpc/rpcsec_tls/rpctls_impl.c
	--- a/sys/rpc/rpcsec_tls/rpctls_impl.c
	+++ b/sys/rpc/rpcsec_tls/rpctls_impl.c
	@@ -190,7 +190,6 @@
	CURVNET_RESTORE();
	return (error);
	}
	- soref(ups.so);
	if (ups.server) {
	/*
	* Once this file descriptor is associated
	@@ -277,6 +276,7 @@
	if (stat != RPC_SUCCESS)
	return (RPC_SYSTEMERROR);

	+ soref(so);
	mtx_lock(&rpctls_lock);
	RB_INSERT(upsock_t, &upcall_sockets, &ups);
	mtx_unlock(&rpctls_lock);
	@@ -388,6 +388,7 @@
	uint32_t *gidv;
	int i;

	+ soref(xprt->xp_socket);
	mtx_lock(&rpctls_lock);
	RB_INSERT(upsock_t, &upcall_sockets, &ups);
	mtx_unlock(&rpctls_lock);
	@@ -407,9 +408,18 @@
	for (i = 0; i < *ngrps; i++)
	gidp++ = gidv++;
	}
	- } else
	+ } else {
	rpctls_rpc_failed(&ups, xprt->xp_socket);

	+ /*
	+ * The socket was closed, make sure the krpc code doesn't close
	+ * it a second time.
	+ */
	+ sx_xlock(&ups.xp->xp_lock);
	+ ups.xp->xp_tls = RPCTLS_FLAGS_HANDSHFAIL;
	+ sx_xunlock(&ups.xp->xp_lock);
	+ }
	+
	mem_free(res.gid.gid_val, 0);

	#ifdef INVARIANTS