[src/netbsd-6]: src/lib/libperfuse Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/fd8cbcc337c3
branches:  netbsd-6
changeset: 776773:fd8cbcc337c3
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Nov 09 06:16:50 2014 +0000

description:
Pull up following revision(s) (requested by manu in ticket #1165):
        lib/libperfuse/ops.c: revision 1.75
Do not trust the filesystem's readdir to give us nul-terminated file
names

diffstat:

 lib/libperfuse/ops.c |  22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diffs (67 lines):

diff -r 6ea4c0b156bd -r fd8cbcc337c3 lib/libperfuse/ops.c
--- a/lib/libperfuse/ops.c      Tue Nov 04 09:27:59 2014 +0000
+++ b/lib/libperfuse/ops.c      Sun Nov 09 06:16:50 2014 +0000
@@ -1,4 +1,4 @@
-/*  $NetBSD: ops.c,v 1.50.2.13 2014/11/04 01:52:53 msaitoh Exp $ */
+/*  $NetBSD: ops.c,v 1.50.2.14 2014/11/09 06:16:50 msaitoh Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -597,6 +597,7 @@
        do {
                char *ndp;
                size_t reclen;
+               char name[MAXPATHLEN];
 
                reclen = _DIRENT_RECLEN(dents, fd->namelen);
 
@@ -629,6 +630,9 @@
                        dents = (struct dirent *)(void *)ndp;
                }
                
+               strncpy(name, fd->name, fd->namelen);
+               name[fd->namelen] = '\0';
+
                /*
                 * Filesystem was mounted without -o use_ino
                 * Perform a lookup to find it.
@@ -641,13 +645,17 @@
                         * Avoid breaking out of fs 
                         * by lookup to .. on root
                         */
-                       if ((strcmp(fd->name, "..") == 0) && 
+                       if ((strcmp(name, "..") == 0) && 
                            (pnd->pnd_nodeid == FUSE_ROOT_ID)) {
                                fd->ino = FUSE_ROOT_ID;
                        } else {
-                               if (node_lookup_common(pu, opc, NULL, fd->name,
-                                                      NULL, &pn) != 0) {
-                                       DWARNX("node_lookup_common failed");
+                               int error;
+
+                               error = node_lookup_common(pu, opc, NULL, 
+                                                          name, NULL, &pn);
+                               if (error != 0) {
+                                       DWARNX("node_lookup_common %s "
+                                              "failed: %d", name, error);
                                } else {
                                        fd->ino = pn->pn_va.va_fileid;
                                        (void)perfuse_node_reclaim(pu, pn);
@@ -659,7 +667,7 @@
                dents->d_reclen = (unsigned short)reclen;
                dents->d_namlen = fd->namelen;
                dents->d_type = fd->type;
-               strlcpy(dents->d_name, fd->name, fd->namelen + 1);
+               strlcpy(dents->d_name, name, fd->namelen + 1);
 
 #ifdef PERFUSE_DEBUG
                if (perfuse_diagflags & PDF_READDIR)
@@ -710,7 +718,7 @@
         */
        if (written != -1)
                PERFUSE_NODE_DATA(opc)->pnd_dirent_len = written;
-       
+
        return written;
 }