diff options
| author |   natano <natano@openbsd.org> | 2016-07-04 18:34:03 +0000 |
|---|---|---|
| committer | natano <natano@openbsd.org> | 2016-07-04 18:34:03 +0000 |
| commit | a16a9cd88c225586c8b1212fb7f2fc462952d1c0 (patch) | |
| tree | 0013868cf27bc42439b726eb7058b0c9a3b08eb2 | |
| parent | DEBUGLIBS has been broken since the gcc4 switch, so delete it. CFLAGS (diff) | |
| download | wireguard-openbsd-a16a9cd88c225586c8b1212fb7f2fc462952d1c0.tar.xz wireguard-openbsd-a16a9cd88c225586c8b1212fb7f2fc462952d1c0.zip | |
Add missing vput() in error path to prevent a vnode getting stuck with a
stale reference and lock, while it shouldn't hold either.
"makes sense to me" beck@
| -rw-r--r-- | sys/nfs/nfs_serv.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index fd4472b6b1b..e3826acf503 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_serv.c,v 1.108 2016/04/29 14:40:36 beck Exp $ */ +/* $OpenBSD: nfs_serv.c,v 1.109 2016/07/04 18:34:03 natano Exp $ */ /* $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $ */ /* @@ -1163,7 +1163,12 @@ nfsrv_mknod(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, pool_put(&namei_pool, nd.ni_cnd.cn_pnbuf); error = NFSERR_BADTYPE; VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd); - vput(nd.ni_dvp); + if (nd.ni_dvp == nd.ni_vp) + vrele(nd.ni_dvp); + else + vput(nd.ni_dvp); + if (nd.ni_vp) + vput(nd.ni_vp); goto out; } VATTR_NULL(&va); @@ -1185,7 +1190,11 @@ nfsrv_mknod(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, pool_put(&namei_pool, nd.ni_cnd.cn_pnbuf); error = EEXIST; VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd); - vput(nd.ni_dvp); + if (nd.ni_dvp == nd.ni_vp) + vrele(nd.ni_dvp); + else + vput(nd.ni_dvp); + vput(nd.ni_vp); goto out; } va.va_type = vtyp; |