Add a couple of safety belt checks to the NFSv4.1 client related to sessions.
There were a couple of cases in newnfs_request() that it assumed that it was an NFSv4.1 mount with a session. This should always be the case when a Sequence operation is in the reply or the server replies NFSERR_BADSESSION. However, if a server was broken and sent an erroneous reply, these safety belt checks should avoid trouble. The one check required a small tweak to nfsmnt_mdssession() so that it returns NULL when there is no session instead of the offset of the field in the structure (0x8 for i386). This patch should have no effect on normal operation of the client. Found by inspection during pNFS server development. MFC after: 2 weeks
This commit is contained in:
parent
00ce0c6258
commit
73b1879c2d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=334966
@ -852,9 +852,9 @@ newnfs_request(struct nfsrv_descript *nd, struct nfsmount *nmp,
|
|||||||
if ((nmp != NULL && i == NFSV4OP_SEQUENCE && j != 0) ||
|
if ((nmp != NULL && i == NFSV4OP_SEQUENCE && j != 0) ||
|
||||||
(clp != NULL && i == NFSV4OP_CBSEQUENCE && j != 0))
|
(clp != NULL && i == NFSV4OP_CBSEQUENCE && j != 0))
|
||||||
NFSCL_DEBUG(1, "failed seq=%d\n", j);
|
NFSCL_DEBUG(1, "failed seq=%d\n", j);
|
||||||
if ((nmp != NULL && i == NFSV4OP_SEQUENCE && j == 0) ||
|
if (((nmp != NULL && i == NFSV4OP_SEQUENCE && j == 0) ||
|
||||||
(clp != NULL && i == NFSV4OP_CBSEQUENCE && j == 0)
|
(clp != NULL && i == NFSV4OP_CBSEQUENCE &&
|
||||||
) {
|
j == 0)) && sep != NULL) {
|
||||||
if (i == NFSV4OP_SEQUENCE)
|
if (i == NFSV4OP_SEQUENCE)
|
||||||
NFSM_DISSECT(tl, uint32_t *,
|
NFSM_DISSECT(tl, uint32_t *,
|
||||||
NFSX_V4SESSIONID +
|
NFSX_V4SESSIONID +
|
||||||
@ -896,7 +896,8 @@ newnfs_request(struct nfsrv_descript *nd, struct nfsmount *nmp,
|
|||||||
}
|
}
|
||||||
if (nd->nd_repstat != 0) {
|
if (nd->nd_repstat != 0) {
|
||||||
if (nd->nd_repstat == NFSERR_BADSESSION &&
|
if (nd->nd_repstat == NFSERR_BADSESSION &&
|
||||||
nmp != NULL && dssep == NULL) {
|
nmp != NULL && dssep == NULL &&
|
||||||
|
(nd->nd_flag & ND_NFSV41) != 0) {
|
||||||
/*
|
/*
|
||||||
* If this is a client side MDS RPC, mark
|
* If this is a client side MDS RPC, mark
|
||||||
* the MDS session defunct and initiate
|
* the MDS session defunct and initiate
|
||||||
|
@ -129,8 +129,10 @@ nfsmnt_mdssession(struct nfsmount *nmp)
|
|||||||
{
|
{
|
||||||
struct nfsclsession *tsep;
|
struct nfsclsession *tsep;
|
||||||
|
|
||||||
|
tsep = NULL;
|
||||||
mtx_lock(&nmp->nm_mtx);
|
mtx_lock(&nmp->nm_mtx);
|
||||||
tsep = NFSMNT_MDSSESSION(nmp);
|
if (TAILQ_FIRST(&nmp->nm_sess) != NULL)
|
||||||
|
tsep = NFSMNT_MDSSESSION(nmp);
|
||||||
mtx_unlock(&nmp->nm_mtx);
|
mtx_unlock(&nmp->nm_mtx);
|
||||||
return (tsep);
|
return (tsep);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user