d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that cr_error is set to ESHUTDOWN when closing the connection.

Browse Source 
This is normally done by a loop in clnt_dg_close(), but requests that aren't
in the pending queue at the time of closing, don't get set. This avoids a
panic in xdrmbuf_create() when it is called with a NULL cr_mrep if
cr_error doesn't get set to ESHUTDOWN while closing.

Reviewed by:	dfr
Approved by:	re (Ken Smith), kib (mentor)
This commit is contained in:
Rick Macklem 2009-07-01 16:38:18 +00:00
parent 6bdcc991ae
commit b766fabd9c
1 changed files with 4 additions and 2 deletions

6
sys/rpc/clnt_dg.c

@ -547,11 +547,13 @@ get_reply:
tv -= time_waited;
if (tv > 0) {
if (cu->cu_closing || cu->cu_closed)
if (cu->cu_closing || cu->cu_closed) {
error = 0;
else
cr->cr_error = ESHUTDOWN;
} else {
error = msleep(cr, &cs->cs_lock,
cu->cu_waitflag, cu->cu_waitchan, tv);
}
} else {
error = EWOULDBLOCK;
}