Author: kib
Date: Mon Dec 2 00:39:58 2019
New Revision: 355279
URL: https://svnweb.freebsd.org/changeset/base/355279
Log:
MFC r355210:
In nfs_lock(), recheck vp->v_data after lock before accessing it.
PR: 242184
Modified:
stable/12/sys/fs/nfsclient/nfs_clvnops.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- stable/12/sys/fs/nfsclient/nfs_clvnops.c Mon Dec 2 00:11:12 2019
(r355278)
+++ stable/12/sys/fs/nfsclient/nfs_clvnops.c Mon Dec 2 00:39:58 2019
(r355279)
@@ -287,6 +287,8 @@ nfs_lock(struct vop_lock1_args *ap)
if (error != 0 || vp->v_op != &newnfs_vnodeops)
return (error);
np = VTONFS(vp);
+ if (np == NULL)
+ return (0);
NFSLOCKNODE(np);
if ((np->n_flag & NVNSETSZSKIP) == 0 || (lktype != LK_SHARED &&
lktype != LK_EXCLUSIVE && lktype != LK_UPGRADE &&
@@ -320,6 +322,9 @@ nfs_lock(struct vop_lock1_args *ap)
error = VOP_LOCK1_APV(&default_vnodeops, ap);
if (error != 0 || vp->v_op != &newnfs_vnodeops)
return (error);
+ if (vp->v_data == NULL)
+ goto downgrade;
+ MPASS(vp->v_data == np);
NFSLOCKNODE(np);
if ((np->n_flag & NVNSETSZSKIP) == 0) {
NFSUNLOCKNODE(np);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
