[src/netbsd-2-0]: src/sys/kern Pull up following revision(s) (requested by si...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef21cd9984a9
branches:  netbsd-2-0
changeset: 564973:ef21cd9984a9
user:      tron <tron%NetBSD.org@localhost>
date:      Wed May 31 21:28:08 2006 +0000

description:
Pull up following revision(s) (requested by simonb in ticket #10633):
        sys/kern/vfs_vnops.c: revision 1.112
Limit the size of any kernel buffers allocated by the VOP_READDIR
routines to MAXBSIZE.

diffstat:

 sys/kern/vfs_vnops.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 2842b4c0c07b -r ef21cd9984a9 sys/kern/vfs_vnops.c
--- a/sys/kern/vfs_vnops.c      Tue May 30 19:50:53 2006 +0000
+++ b/sys/kern/vfs_vnops.c      Wed May 31 21:28:08 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_vnops.c,v 1.77.2.1 2005/11/14 22:16:32 riz Exp $   */
+/*     $NetBSD: vfs_vnops.c,v 1.77.2.2 2006/05/31 21:28:08 tron Exp $  */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.77.2.1 2005/11/14 22:16:32 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.77.2.2 2006/05/31 21:28:08 tron Exp $");
 
 #include "fs_union.h"
 
@@ -450,6 +450,9 @@
        struct uio auio;
        int error, eofflag;
 
+       /* Limit the size on any kernel buffers used by VOP_READDIR */
+       count = min(MAXBSIZE, count);
+
 unionread:
        if (vp->v_type != VDIR)
                return (EINVAL);