Module Name: src
Committed By: yamt
Date: Wed Jun 24 14:21:44 UTC 2009
Modified Files:
src/sys/kern [yamt-nfs-mp]: vfs_syscalls.c
src/sys/nfs [yamt-nfs-mp]: nfs_vfsops.c nfs_vnops.c
Log Message:
lock vnode when calling VOP_GETATTR because there's no reasonable way for
an implementation of VOP_GETATTR to prevent the vnode from being revoked.
To generate a diff of this commit:
cvs rdiff -u -r1.350.2.2 -r1.350.2.3 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.196.10.4 -r1.196.10.5 src/sys/nfs/nfs_vfsops.c
cvs rdiff -u -r1.266.10.3 -r1.266.10.4 src/sys/nfs/nfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.350.2.2 src/sys/kern/vfs_syscalls.c:1.350.2.3
--- src/sys/kern/vfs_syscalls.c:1.350.2.2 Mon May 4 08:13:49 2009
+++ src/sys/kern/vfs_syscalls.c Wed Jun 24 14:21:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.350.2.2 2009/05/04 08:13:49 yamt Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.350.2.3 2009/06/24 14:21:43 yamt Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.350.2.2 2009/05/04 08:13:49 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.350.2.3 2009/06/24 14:21:43 yamt Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -2185,7 +2185,9 @@
newoff = fp->f_offset + SCARG(uap, offset);
break;
case SEEK_END:
+ vn_lock(vp, LK_SHARED | LK_RETRY);
error = VOP_GETATTR(vp, &vattr, cred);
+ VOP_UNLOCK(vp, 0);
if (error) {
goto out;
}
@@ -3586,7 +3588,10 @@
struct vattr vattr;
int error;
- if ((error = VOP_GETATTR(vp, &vattr, cred)) != 0)
+ vn_lock(vp, LK_SHARED | LK_RETRY);
+ error = VOP_GETATTR(vp, &vattr, cred);
+ VOP_UNLOCK(vp, 0);
+ if (error != 0)
return error;
if (kauth_cred_geteuid(cred) == vattr.va_uid ||
(error = kauth_authorize_generic(cred,
Index: src/sys/nfs/nfs_vfsops.c
diff -u src/sys/nfs/nfs_vfsops.c:1.196.10.4 src/sys/nfs/nfs_vfsops.c:1.196.10.5
--- src/sys/nfs/nfs_vfsops.c:1.196.10.4 Wed Jun 24 14:15:35 2009
+++ src/sys/nfs/nfs_vfsops.c Wed Jun 24 14:21:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vfsops.c,v 1.196.10.4 2009/06/24 14:15:35 yamt Exp $ */
+/* $NetBSD: nfs_vfsops.c,v 1.196.10.5 2009/06/24 14:21:43 yamt Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.196.10.4 2009/06/24 14:15:35 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.196.10.5 2009/06/24 14:21:43 yamt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_nfs.h"
@@ -386,9 +386,13 @@
vfs_unbusy(mp, false, NULL);
/* Get root attributes (for the time). */
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error)
+ panic("nfs_mountroot: lock for root");
error = VOP_GETATTR(vp, &attr, l->l_cred);
if (error)
panic("nfs_mountroot: getattr for root");
+ VOP_UNLOCK(vp, 0);
n = attr.va_atime.tv_sec;
#ifdef DEBUG
printf("root time: 0x%lx\n", n);
Index: src/sys/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.266.10.3 src/sys/nfs/nfs_vnops.c:1.266.10.4
--- src/sys/nfs/nfs_vnops.c:1.266.10.3 Sat May 16 10:41:51 2009
+++ src/sys/nfs/nfs_vnops.c Wed Jun 24 14:21:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.266.10.3 2009/05/16 10:41:51 yamt Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.266.10.4 2009/06/24 14:21:43 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.266.10.3 2009/05/16 10:41:51 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.266.10.4 2009/06/24 14:21:43 yamt Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -571,6 +571,8 @@
struct mbuf *mreq, *mrep, *md, *mb;
const int v3 = NFS_ISV3(vp);
+ KASSERT(VOP_ISLOCKED(vp));
+
/*
* Update local times for special files.
*/
