Changeset 39249 in vbox for trunk/src/VBox/Additions/solaris/SharedFolders

Timestamp:

Nov 9, 2011 12:52:14 PM (13 years ago)

Author:

vboxsync

Message:

Additions/solaris/SharedFolders: fix directory seeking bug with incorrect dirent offset. du on a shared folder works now instead of causing a kernel panic.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• vboxfs_prov.c (modified) (3 diffs)
• vboxfs_vfs.c (modified) (1 diff)
• vboxfs_vnode.c (modified) (2 diffs)

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c

@@ -878 +878 @@
         uint32_t nents;
         uint32_t size;
-        uint32_t cnt;
+        off_t offset;
         sffs_dirents_t *cur_buf;
         sffs_stats_t *cur_stats;
@@ -937 +937 @@
         }
 
-        cnt = 0;
+        offset = 0;
         for (;;) {
                 numbytes = infobuff_alloc;
@@ -989 +989 @@
                         dirent = (dirent64_t *)
                             (((char *) &cur_buf->sf_entries[0]) + cur_buf->sf_len);
-                        strcpy(&dirent->d_name[0], info->name.String.utf8);
+                        strncpy(&dirent->d_name[0], info->name.String.utf8, DIRENT64_NAMELEN(reclen));
                         dirent->d_reclen = reclen;
-                        dirent->d_off = cnt;
+                        offset += reclen;
+                        dirent->d_off = offset;
 
                         cur_buf->sf_len += reclen;
-                        ++cnt;
 
                         /* save the stats */

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c

@@ -356 +356 @@
             ddi_strtol(optval, NULL, 10, &val) == 0 &&
             (int)val == val)
+        {
                 stat_ttl = val;
+        }
+        else
+                vfs_setmntopt(vfsp, "stat_ttl", VBOXSOLQUOTE(DEF_STAT_TTL_MS), 0);
 
         /*

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c

@@ -313 +313 @@
                 sfnode_clear_dir_list(parent);
                 if (parent->sf_children == 0)
-                        panic("sfnode_destroy(%s) parent has no child", node->sf_path);
+                        panic("sfnode_destroy parent (%s) has no child", parent->sf_path);
                 --parent->sf_children;
                 if (parent->sf_children == 0 &&
@@ -2138 +2138 @@
         if (*no < 0 || *no > MAXOFFSET_T)
                 return (EINVAL);
+
+        if (v->v_type == VDIR)
+        {
+                sffs_dirents_t *cur_buf = VN2SFN(v)->sf_dir_list;
+                off_t offset = 0;
+
+                if (cur_buf == NULL)
+                        return (0);
+
+                while (cur_buf != NULL) {
+                        if (*no >= offset && *no <= offset + cur_buf->sf_len)
+                                return (0);
+                        offset += cur_buf->sf_len;
+                        cur_buf = cur_buf->sf_next;
+                }
+                return (EINVAL);
+        }
         return (0);
 }