Author: rmacklem
Date: Tue Dec 10 22:03:59 2013
New Revision: 259201
URL: http://svnweb.freebsd.org/changeset/base/259201
Log:
MFC: r257598
During code inspection, I spotted that there was a code path where
CLNT_CONTROL() would be called on "client" after it was
released via CLNT_RELEASE(). It was unlikely that this
code path gets executed and I have not heard of any problem
report caused by this bug. This patch fixes the code so that
this cannot happen.
Modified:
stable/9/sys/fs/nfs/nfs_commonkrpc.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/fs/ (props changed)
Modified: stable/9/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- stable/9/sys/fs/nfs/nfs_commonkrpc.c Tue Dec 10 21:15:18 2013
(r259200)
+++ stable/9/sys/fs/nfs/nfs_commonkrpc.c Tue Dec 10 22:03:59 2013
(r259201)
@@ -316,24 +316,25 @@ newnfs_connect(struct nfsmount *nmp, str
mtx_lock(&nrp->nr_mtx);
if (nrp->nr_client != NULL) {
+ mtx_unlock(&nrp->nr_mtx);
/*
* Someone else already connected.
*/
CLNT_RELEASE(client);
} else {
nrp->nr_client = client;
+ /*
+ * Protocols that do not require connections may be optionally
+ * left unconnected for servers that reply from a port other
+ * than NFS_PORT.
+ */
+ if (nmp == NULL || (nmp->nm_flag & NFSMNT_NOCONN) == 0) {
+ mtx_unlock(&nrp->nr_mtx);
+ CLNT_CONTROL(client, CLSET_CONNECT, &one);
+ } else
+ mtx_unlock(&nrp->nr_mtx);
}
- /*
- * Protocols that do not require connections may be optionally left
- * unconnected for servers that reply from a port other than NFS_PORT.
- */
- if (nmp == NULL || (nmp->nm_flag & NFSMNT_NOCONN) == 0) {
- mtx_unlock(&nrp->nr_mtx);
- CLNT_CONTROL(client, CLSET_CONNECT, &one);
- } else {
- mtx_unlock(&nrp->nr_mtx);
- }
/* Restore current thread's credentials. */
td->td_ucred = origcred;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
