[src/trunk]: src/sys/compat/linux32/common fix size computation

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

details:   https://anonhg.NetBSD.org/src/rev/9586a55578af
branches:  trunk
changeset: 821199:9586a55578af
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 28 15:08:06 2017 +0000

description:
fix size computation

diffstat:

 sys/compat/linux32/common/linux32_dirent.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r cf60c5d3edec -r 9586a55578af sys/compat/linux32/common/linux32_dirent.c
--- a/sys/compat/linux32/common/linux32_dirent.c        Sat Jan 28 15:01:01 2017 +0000
+++ b/sys/compat/linux32/common/linux32_dirent.c        Sat Jan 28 15:08:06 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux32_dirent.c,v 1.14 2017/01/13 21:02:05 christos Exp $ */
+/*     $NetBSD: linux32_dirent.c,v 1.15 2017/01/28 15:08:06 christos Exp $ */
 
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: linux32_dirent.c,v 1.14 2017/01/13 21:02:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_dirent.c,v 1.15 2017/01/28 15:08:06 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -215,9 +215,9 @@
                        idb.d_off = (linux32_off_t)off;
                        idb.d_reclen = (u_short)linux32_reclen;
                }
-               memcpy(idb.d_name, bdp->d_name, MIN(sizeof(idb.d_name), 
-                   bdp->d_namlen));
-               idb.d_name[strlen(idb.d_name) + 1] = bdp->d_type;
+               size_t l = MIN(sizeof(idb.d_name) - 2, bdp->d_namlen + 1);
+               memcpy(idb.d_name, bdp->d_name, l);
+               idb.d_name[l + 1] = bdp->d_type;
                if ((error = copyout((void *)&idb, outp, linux32_reclen)))
                        goto out;
                /* advance past this real entry */