Changeset 77859 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 24, 2019 2:36:08 AM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Return -EPERM when the host refuses to create symlinks. Added iocharset to /proc/mount output and skipped default dmode, fmode, dmask and fmask values as the first two couldn't be parsed by the mount helper. Fixed the mount helper so it can parse it in case someone gets smart and 'fixes' the code again. bugref:9172

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (1 diff)
• lnkops.c (modified) (1 diff)
• mount.vboxsf.c (modified) (1 diff)
• vfsmod.c (modified) (3 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

@@ -1297 +1297 @@
                 } else {
                     int const vrc = rc;
-                    rc = -RTErrConvertToErrno(rc);
+                    if (vrc == VERR_WRITE_PROTECT)
+                        rc = -EPERM; /* EPERM: Symlink creation not supported according to the linux manpage as of 2017-09-15.
+                                        "VBoxInternal2/SharedFoldersEnableSymlinksCreate/<share>" is not 1. */
+                    else
+                        rc = -RTErrConvertToErrno(vrc);
                     SFLOGFLOW(("vbsf_inode_symlink: VbglR0SfHostReqCreateSymlinkContig failed for '%s' -> '%s': %Rrc (-> %d)\n",
                                pPath->String.ach, pTarget->String.ach, vrc, rc));

trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c

@@ -298 +298 @@
 };
 
-

trunk/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c

@@ -82 +82 @@
     long long int val = strtoll(s, &endptr, base);
 
-    if (val < INT_MIN || val > INT_MAX || endptr < s + size)
+    if (   val < INT_MIN
+        || (   val > INT_MAX
+            && (base != 8 || val != UINT_MAX) ) /* hack for printf("%o", -1) - 037777777777 */
+        || endptr < s + size)
     {
         errno = ERANGE;
-        panic_err("could not convert %.*s to integer, result = %d",
-                   (int)size, s, (int) val);
+        panic_err("could not convert %.*s to integer, result = %lld (%d)",
+                  (int)size, s, val, (int)val);
     }
     return (int)val;

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

@@ -193 +193 @@
         if (info->nls_name[0]) {
             if (_IS_UTF8(info->nls_name)) {
+                SFLOGFLOW(("vbsf_super_info_alloc_and_map_it: nls=utf8\n"));
                 sf_g->nls = NULL;
             } else {
@@ -213 +214 @@
                 sf_g->nls = load_nls_default();
                 SFLOGFLOW(("vbsf_super_info_alloc_and_map_it: CONFIG_NLS_DEFAULT=%s -> %p\n", CONFIG_NLS_DEFAULT, sf_g->nls));
-            } else
+            } else {
+                SFLOGFLOW(("vbsf_super_info_alloc_and_map_it: nls=utf8 (default %s)\n", CONFIG_NLS_DEFAULT));
                 sf_g->nls = NULL;
+            }
 #else
+            SFLOGFLOW(("vbsf_super_info_alloc_and_map_it: nls=utf8 (no default)\n"));
             sf_g->nls = NULL;
 #endif
@@ -708 +712 @@
     struct vbsf_super_info *sf_g = VBSF_GET_SUPER_INFO(sb);
     if (sf_g) {
-        seq_printf(m, ",uid=%u,gid=%u,ttl=%d,dmode=0%o,fmode=0%o,dmask=0%o,fmask=0%o,maxiopages=%u",
-               sf_g->uid, sf_g->gid, sf_g->ttl_msec, sf_g->dmode, sf_g->fmode, sf_g->dmask,
-               sf_g->fmask, sf_g->cMaxIoPages);
+        seq_printf(m, ",uid=%u,gid=%u,ttl=%d,maxiopages=%u,iocharset=%s",
+                   sf_g->uid, sf_g->gid, sf_g->ttl_msec, sf_g->cMaxIoPages, sf_g->nls ? sf_g->nls->charset : "utf8");
+        if (sf_g->dmode != ~0)
+            seq_printf(m, ",dmode=0%o", sf_g->dmode);
+        if (sf_g->fmode != ~0)
+            seq_printf(m, ",fmode=0%o", sf_g->fmode);
+        if (sf_g->dmask != 0)
+            seq_printf(m, ",dmask=0%o", sf_g->dmask);
+        if (sf_g->fmask != 0)
+            seq_printf(m, ",fmask=0%o", sf_g->fmask);
         if (sf_g->tag[0] != '\0') {
             seq_puts(m, ",tag=");