Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Nov 2021 23:23:11 GMT
From:      Rick Macklem <rmacklem@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 611423faf7a1 - stable/13 - nfscl: Add a missing delegation lock release
Message-ID:  <202111092323.1A9NNBNT027435@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=611423faf7a1316cc56209cf99ae9a6d2aa9fad5

commit 611423faf7a1316cc56209cf99ae9a6d2aa9fad5
Author:     Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2021-10-26 02:09:14 +0000
Commit:     Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2021-11-09 23:20:00 +0000

    nfscl: Add a missing delegation lock release
    
    There was a case in nfscl_doiods() where the function would return
    without releasing the delegation shared lock, if it was aquired by
    the call to nfscl_getstateid().  This patch adds that release.
    
    I have never observed a failure due to this missing release, so I
    do not know if it ever happens in practice.  However, since the pNFS
    client is not yet heavily used, it might be the case.
    
    Found by code inspection during a recent NFSv4 IETF working group
    testing event.
    
    (cherry picked from commit 23024f004a4c5659bfcb0b08fac2211ae925ee58)
---
 sys/fs/nfsclient/nfs_clrpcops.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c
index 30b68b1dcb1b..94f7496378c5 100644
--- a/sys/fs/nfsclient/nfs_clrpcops.c
+++ b/sys/fs/nfsclient/nfs_clrpcops.c
@@ -5799,6 +5799,8 @@ nfscl_doiods(vnode_t vp, struct uio *uiop, int *iomode, int *must_commit,
 	if (layp == NULL || rflp == NULL) {
 		if (recalled != 0) {
 			NFSFREECRED(newcred);
+			if (lckp != NULL)
+				nfscl_lockderef(lckp);
 			nfscl_relref(nmp);
 			return (EIO);
 		}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111092323.1A9NNBNT027435>