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

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

details:   https://anonhg.NetBSD.org/src/rev/3a51071d46c7
branches:  netbsd-7-0
changeset: 801359:3a51071d46c7
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Aug 12 04:11:10 2017 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1478):
        sys/kern/vfs_getcwd.c: revision 1.52
Don't walk off the end of the dirent buffer.
>From Ilja Van Sprundel.

diffstat:

 sys/kern/vfs_getcwd.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r f20b8342585e -r 3a51071d46c7 sys/kern/vfs_getcwd.c
--- a/sys/kern/vfs_getcwd.c     Sat Aug 12 04:08:25 2017 +0000
+++ b/sys/kern/vfs_getcwd.c     Sat Aug 12 04:11:10 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_getcwd.c,v 1.50 2014/02/07 15:29:22 hannken Exp $ */
+/* $NetBSD: vfs_getcwd.c,v 1.50.8.1 2017/08/12 04:11:10 snj Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_getcwd.c,v 1.50 2014/02/07 15:29:22 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_getcwd.c,v 1.50.8.1 2017/08/12 04:11:10 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -211,7 +211,8 @@
                                reclen = dp->d_reclen;
 
                                /* check for malformed directory.. */
-                               if (reclen < _DIRENT_MINSIZE(dp)) {
+                               if (reclen < _DIRENT_MINSIZE(dp) ||
+                                   reclen > len) {
                                        error = EINVAL;
                                        goto out;
                                }