Changeset 69149 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Oct 20, 2017 2:53:19 PM (7 years ago)

Author:

vboxsync

Message:

Additions/linux/shfl: stop supporting old host/mount.vboxsf versions.
bugref:4567: Linux kernel driver maintenance

Based on [PATCH] Remove support for old hosts and userspace mount.vboxsf
Signed-off-by: Hans de Goede <hdegoede@…>

Versions of VirtualBox many years ago used a different host/guest protocol
for accessing shared folders, as well as a different guest kernel to
user-space mount helper protocol. While we try to support old Additions
versions on the host side, we only aim to support old host versions in the
Additions to a limited extent, and the guest kernel interface is also only
fixed for a defined range of releases.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• mount.vboxsf.c (modified) (1 diff)
• vbsfmount.h (modified) (2 diffs)
• vfsmod.c (modified) (2 diffs)

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

@@ -504 +504 @@
         err = mount(host_name, mount_point, "vboxsf", flags, &mntinf);
     }
-    if (err == -1 && errno == EPROTO)
-    {
-        /* New mount tool with old vboxsf module? Try again using the old
-         * vbsf_mount_info_old structure. */
-        struct vbsf_mount_info_old mntinf_old;
-        memcpy(&mntinf_old.name, &mntinf.name, MAX_HOST_NAME);
-        memcpy(&mntinf_old.nls_name, mntinf.nls_name, MAX_NLS_NAME);
-        mntinf_old.uid = mntinf.uid;
-        mntinf_old.gid = mntinf.gid;
-        mntinf_old.ttl = mntinf.ttl;
-        err = mount(host_name, mount_point, "vboxsf", flags, &mntinf_old);
-    }
     if (err)
         panic_err("%s: mounting failed with the error", argv[0]);

trunk/src/VBox/Additions/linux/sharedfolders/vbsfmount.h

@@ -18 +18 @@
 #define VBFS_MOUNT_H
 
+/* Linux constraints the size of data mount argument to PAGE_SIZE - 1. */
 #define MAX_HOST_NAME  256
 #define MAX_NLS_NAME    32
-
-/* Linux constraints the size of data mount argument to PAGE_SIZE - 1. */
-struct vbsf_mount_info_old
-{
-    char name[MAX_HOST_NAME];
-    char nls_name[MAX_NLS_NAME];
-    int  uid;
-    int  gid;
-    int  ttl;
-};
 
 #define VBSF_MOUNT_SIGNATURE_BYTE_0 '\377'
@@ -37 +28 @@
 struct vbsf_mount_info_new
 {
-    char nullchar;              /* name cannot be '\0' -- we use this field
-                                   to distinguish between the old structure
-                                   and the new structure */
+    /*
+     * The old version of the mount_info struct started with a
+     * char name[MAX_HOST_NAME] field, where name cannot be '\0'.
+     * So the new version of the mount_info struct starts with a
+     * nullchar field which is always 0 so that we can detect and
+     * reject the old structure being passed.
+     */
+    char nullchar;
     char signature[3];          /* signature */
     int  length;                /* length of the whole structure */

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

@@ -75 +75 @@
         || info->signature[2] != VBSF_MOUNT_SIGNATURE_BYTE_2)
     {
-        /* An old version of mount.vboxsf made the syscall. Translate the
-         * old parameters to the new structure. */
-        struct vbsf_mount_info_old *info_old = (struct vbsf_mount_info_old *)info;
-        static struct vbsf_mount_info_new info_compat;
-
-        info = &info_compat;
-        memset(info, 0, sizeof(*info));
-        memcpy(&info->name, &info_old->name, MAX_HOST_NAME);
-        memcpy(&info->nls_name, &info_old->nls_name, MAX_NLS_NAME);
-        info->length = offsetof(struct vbsf_mount_info_new, dmode);
-        info->uid    = info_old->uid;
-        info->gid    = info_old->gid;
-        info->ttl    = info_old->ttl;
+        err = -EINVAL;
+        goto fail1;
     }
 
@@ -94 +83 @@
 
     name_len = strlen(info->name);
-    if (name_len > 0xfffe)
-    {
-        err = -ENAMETOOLONG;
-        LogFunc(("map name too big\n"));
-        goto fail1;
-    }
-
     str_len = offsetof(SHFLSTRING, String.utf8) + name_len + 1;
     str_name = kmalloc(str_len, GFP_KERNEL);