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

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

details:   https://anonhg.NetBSD.org/src/rev/523b08d03001
branches:  netbsd-7
changeset: 798408:523b08d03001
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Oct 11 16:25:19 2014 +0000

description:
Pull up following revision(s) (requested by manu in ticket #134):
        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 b7f530d25b9a -r 523b08d03001 lib/libperfuse/ops.c
--- a/lib/libperfuse/ops.c      Sat Oct 11 16:22:28 2014 +0000
+++ b/lib/libperfuse/ops.c      Sat Oct 11 16:25:19 2014 +0000
@@ -1,4 +1,4 @@
-/*  $NetBSD: ops.c,v 1.66.2.6 2014/09/12 08:13:20 martin Exp $ */
+/*  $NetBSD: ops.c,v 1.66.2.7 2014/10/11 16:25:19 snj Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -607,6 +607,7 @@
        do {
                char *ndp;
                size_t reclen;
+               char name[MAXPATHLEN];
 
                reclen = _DIRENT_RECLEN(dents, fd->namelen);
 
@@ -639,6 +640,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.
@@ -651,13 +655,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);
@@ -669,7 +677,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)
@@ -720,7 +728,7 @@
         */
        if (written != -1)
                PERFUSE_NODE_DATA(opc)->pnd_dirent_len = written;
-       
+
        return written;
 }