The branch main has been updated by rmacklem:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=33d0be8a923a840ec0724d50815890c5ffe0e884

commit 33d0be8a923a840ec0724d50815890c5ffe0e884
Author:     Rick Macklem <rmack...@freebsd.org>
AuthorDate: 2021-12-01 21:46:41 +0000
Commit:     Rick Macklem <rmack...@freebsd.org>
CommitDate: 2021-12-01 21:46:41 +0000

    nfsd: Do not try to cache a reply for NFSERR_BADSLOT
    
    When nfsrv_checksequence() replies NFSERR_BADSLOT,
    the value of nd_slotid is not valid.  As such, the
    reply cannot be cached in the session.
    Do not set ND_HASSEQUENCE for this case.
    
    Reported by:    r...@lcs.mit.edu
    Tested by:      r...@lcs.mit.edu
    PR:     260076
    MFC after:      2 weeks
---
 sys/fs/nfsserver/nfs_nfsdserv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c
index 445ef2ad9e2b..e5ccbfe7fc37 100644
--- a/sys/fs/nfsserver/nfs_nfsdserv.c
+++ b/sys/fs/nfsserver/nfs_nfsdserv.c
@@ -4566,9 +4566,10 @@ nfsrvd_sequence(struct nfsrv_descript *nd, __unused int 
isdgram,
                cache_this = 1;
        else
                cache_this = 0;
-       nd->nd_flag |= ND_HASSEQUENCE;
        nd->nd_repstat = nfsrv_checksequence(nd, sequenceid, &highest_slotid,
            &target_highest_slotid, cache_this, &sflags, p);
+       if (nd->nd_repstat != NFSERR_BADSLOT)
+               nd->nd_flag |= ND_HASSEQUENCE;
        if (nd->nd_repstat == 0) {
                NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID);
                NFSBCOPY(nd->nd_sessionid, tl, NFSX_V4SESSIONID);

Reply via email to