summaryrefslogtreecommitdiffstats
path: root/sys/kern/vfs_vnops.c
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2012-11-02 13:56:36 +0000
committerkib <kib@FreeBSD.org>2012-11-02 13:56:36 +0000
commitf16ea990070abd8c9cb42bfc7001ada604b4df01 (patch)
tree77eb9f8e9de108d0ae7792cfceedcd340198177e /sys/kern/vfs_vnops.c
parent37f3bd87e4ec81bcec505485b1cf96c74db846f0 (diff)
downloadFreeBSD-src-f16ea990070abd8c9cb42bfc7001ada604b4df01.zip
FreeBSD-src-f16ea990070abd8c9cb42bfc7001ada604b4df01.tar.gz
The r241025 fixed the case when a binary, executed from nullfs mount,
was still possible to open for write from the lower filesystem. There is a symmetric situation where the binary could already has file descriptors opened for write, but it can be executed from the nullfs overlay. Handle the issue by passing one v_writecount reference to the lower vnode if nullfs vnode has non-zero v_writecount. Note that only one write reference can be donated, since nullfs only keeps one use reference on the lower vnode. Always use the lower vnode v_writecount for the checks. Introduce the VOP_GET_WRITECOUNT to read v_writecount, which is currently always bypassed to the lower vnode, and VOP_ADD_WRITECOUNT to manipulate the v_writecount value, which manages a single bypass reference to the lower vnode. Caling the VOPs instead of directly accessing v_writecount provide the fix described in the previous paragraph. Tested by: pho MFC after: 3 weeks
Diffstat (limited to 'sys/kern/vfs_vnops.c')
-rw-r--r--sys/kern/vfs_vnops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 402a9d0..ea42f9d 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -302,7 +302,7 @@ vn_open_vnode(struct vnode *vp, int fmode, struct ucred *cred,
fp->f_flag |= FHASLOCK;
}
if (fmode & FWRITE) {
- vp->v_writecount++;
+ VOP_ADD_WRITECOUNT(vp, 1);
CTR3(KTR_VFS, "%s: vp %p v_writecount increased to %d",
__func__, vp, vp->v_writecount);
}
@@ -355,7 +355,7 @@ vn_close(vp, flags, file_cred, td)
if (flags & FWRITE) {
VNASSERT(vp->v_writecount > 0, vp,
("vn_close: negative writecount"));
- vp->v_writecount--;
+ VOP_ADD_WRITECOUNT(vp, -1);
CTR3(KTR_VFS, "%s: vp %p v_writecount decreased to %d",
__func__, vp, vp->v_writecount);
}
OpenPOWER on IntegriCloud