diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 539c418c60e2..b8ad69e97a8a 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -997,15 +997,16 @@ chroot_refuse_vdir_fds(fdp)
 
 	FILEDESC_LOCK(fdp);
 	for (fd = 0; fd < fdp->fd_nfiles ; fd++) {
-		error = getvnode(fdp, fd, &fp);
-		if (error)
+		fp = fget_locked(fdp, fd);
+		if (fp == NULL)
 			continue;
-		vp = (struct vnode *)fp->f_data;
-		fdrop(fp, td);
-		if (vp->v_type != VDIR)
-			continue;
-		FILEDESC_UNLOCK(fdp);
-		return(EPERM);
+		if (fp->f_type == DTYPE_VNODE) {
+			vp = (struct vnode *)fp->f_data;
+			if (vp->v_type == VDIR) {
+				FILEDESC_UNLOCK(fdp);
+				return (EPERM);
+			}
+		}
 	}
 	FILEDESC_UNLOCK(fdp);
 	return (0);
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 539c418c60e2..b8ad69e97a8a 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -997,15 +997,16 @@ chroot_refuse_vdir_fds(fdp)
 
 	FILEDESC_LOCK(fdp);
 	for (fd = 0; fd < fdp->fd_nfiles ; fd++) {
-		error = getvnode(fdp, fd, &fp);
-		if (error)
+		fp = fget_locked(fdp, fd);
+		if (fp == NULL)
 			continue;
-		vp = (struct vnode *)fp->f_data;
-		fdrop(fp, td);
-		if (vp->v_type != VDIR)
-			continue;
-		FILEDESC_UNLOCK(fdp);
-		return(EPERM);
+		if (fp->f_type == DTYPE_VNODE) {
+			vp = (struct vnode *)fp->f_data;
+			if (vp->v_type == VDIR) {
+				FILEDESC_UNLOCK(fdp);
+				return (EPERM);
+			}
+		}
 	}
 	FILEDESC_UNLOCK(fdp);
 	return (0);