Changeset 44163 in vbox

Timestamp:

Dec 19, 2012 12:25:14 PM (12 years ago)

Author:

vboxsync

Message:

Linux Additions/shared folders: don't crash on remount if we were not called from mount.vboxsf

File:

• trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c (modified) (2 diffs)

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

@@ -441 +441 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 23)
     struct sf_glob_info *sf_g;
-    struct vbsf_mount_info_new *info;
     struct sf_inode_info *sf_i;
     struct inode *iroot;
@@ -449 +448 @@
     sf_g = GET_GLOB_INFO(sb);
     BUG_ON(!sf_g);
-    BUG_ON(data[0] != 0);
-    info = (struct vbsf_mount_info_new *)data;
-    BUG_ON(   info->signature[0] != VBSF_MOUNT_SIGNATURE_BYTE_0
-           || info->signature[1] != VBSF_MOUNT_SIGNATURE_BYTE_1
-           || info->signature[2] != VBSF_MOUNT_SIGNATURE_BYTE_2);
-
-    sf_g->uid = info->uid;
-    sf_g->gid = info->gid;
-    sf_g->ttl = info->ttl;
-    sf_g->dmode = info->dmode;
-    sf_g->fmode = info->fmode;
-    sf_g->dmask = info->dmask;
-    sf_g->fmask = info->fmask;
+    if (data && data[0] != 0)
+    {
+        struct vbsf_mount_info_new *info = 
+            (struct vbsf_mount_info_new *)data;
+        if (   info->signature[0] == VBSF_MOUNT_SIGNATURE_BYTE_0
+            && info->signature[1] == VBSF_MOUNT_SIGNATURE_BYTE_1
+            && info->signature[2] == VBSF_MOUNT_SIGNATURE_BYTE_2)
+        {
+            sf_g->uid = info->uid;
+            sf_g->gid = info->gid;
+            sf_g->ttl = info->ttl;
+            sf_g->dmode = info->dmode;
+            sf_g->fmode = info->fmode;
+            sf_g->dmask = info->dmask;
+            sf_g->fmask = info->fmask;
+        }
+    }
 
     iroot = ilookup(sb, 0);