svn commit: r209985 - stable/7/sys/kern

[Konstantin Belousov]

Author: kib
Date: Tue Jul 13 08:53:41 2010
New Revision: 209985
URL: http://svn.freebsd.org/changeset/base/209985

Log:
  MFC r209742:
  In revoke(), verify that VCHR vnode indeed belongs to devfs.

Modified:
  stable/7/sys/kern/vfs_syscalls.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/kern/vfs_syscalls.c
==============================================================================
--- stable/7/sys/kern/vfs_syscalls.c	Tue Jul 13 08:45:50 2010	(r209984)
+++ stable/7/sys/kern/vfs_syscalls.c	Tue Jul 13 08:53:41 2010	(r209985)
@@ -3963,7 +3963,7 @@ revoke(td, uap)
 	vfslocked = NDHASGIANT(&nd);
 	vp = nd.ni_vp;
 	NDFREE(&nd, NDF_ONLY_PNBUF);
-	if (vp->v_type != VCHR) {
+	if (vp->v_type != VCHR || vp->v_rdev == NULL) {
 		error = EINVAL;
 		goto out;
 	}