Changeset 11507 in vbox for trunk

Timestamp:

Aug 20, 2008 9:39:18 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

35028

Message:

Linux guest additions: allow to specify dmode, fmode, umask, dmask, fmask when mounting a shared folder. Note: read/write permissions currently not checked by vboxvfs.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (1 diff)
• mount.vboxsf.c (modified) (10 diffs)
• regops.c (modified) (3 diffs)
• utils.c (modified) (2 diffs)
• vbsfmount.h (modified) (1 diff)
• vfsmod.c (modified) (5 diffs)
• vfsmod.h (modified) (1 diff)

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

@@ -118 +118 @@
    1       end reached
    -errno  some form of error*/
-int
+static int
 sf_getdent (struct file *dir, char d_name[NAME_MAX])
 {

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

@@ -58 +58 @@
 
 struct opts {
-    int uid;
-    int gid;
-    int ttl;
-    int ronly;
-    int noexec;
-    int nodev;
-    int nosuid;
-    int remount;
+    int  uid;
+    int  gid;
+    int  ttl;
+    int  dmode;
+    int  fmode;
+    int  dmask;
+    int  fmask;
+    int  ronly;
+    int  noexec;
+    int  nodev;
+    int  nosuid;
+    int  remount;
     char nls_name[MAX_NLS_NAME];
     char *convertcp;
@@ -97 +101 @@
 
 static int
-safe_atoi (const char *s, size_t size)
+safe_atoi (const char *s, size_t size, int base)
 {
     char *endptr;
-    long long int val = strtoll (s, &endptr, 10);
+    long long int val = strtoll (s, &endptr, base);
 
     if (val < INT_MIN || val > INT_MAX || endptr < s + size) {
@@ -122 +126 @@
         HOGID,
         HOTTL,
+        HODMODE,
+        HOFMODE,
+        HOUMASK,
+        HODMASK,
+        HOFMASK,
         HOIOCHARSET,
         HOCONVERTCP,
@@ -145 +154 @@
         {"iocharset", HOIOCHARSET, 1, "i/o charset (default utf8)"},
         {"convertcp", HOCONVERTCP, 1, "convert share name from given charset to utf8"},
+        {"dmode",     HODMODE,     1, "mode of all directories"},
+        {"fmode",     HOFMODE,     1, "mode of all regular files"},
+        {"umask",     HOUMASK,     1, "umask of directories and regular files"},
+        {"dmask",     HODMASK,     1, "umask of directories"},
+        {"fmask",     HOFMASK,     1, "umask of regular files"},
         {"noexec",    HONOEXEC,    0, 0 }, /* don't document these options directly here */
         {"exec",      HOEXEC,      0, 0 }, /* as they are well known and described in the */
@@ -227 +241 @@
                     break;
                 case HOUID:
-                    opts->uid = safe_atoi (val, val_len);
+                    opts->uid = safe_atoi (val, val_len, 10);
                     break;
                 case HOGID:
-                    opts->gid = safe_atoi (val, val_len);
+                    opts->gid = safe_atoi (val, val_len, 10);
                     break;
                 case HOTTL:
-                    opts->ttl = safe_atoi (val, val_len);
+                    opts->ttl = safe_atoi (val, val_len, 10);
+                    break;
+                case HODMODE:
+                    opts->dmode = safe_atoi (val, val_len, 8);
+                    break;
+                case HOFMODE:
+                    opts->fmode = safe_atoi (val, val_len, 8);
+                    break;
+                case HOUMASK:
+                    opts->dmask = opts->fmask = safe_atoi (val, val_len, 8);
+                    break;
+                case HODMASK:
+                    opts->dmask = safe_atoi (val, val_len, 8);
+                    break;
+                case HOFMASK:
+                    opts->fmask = safe_atoi (val, val_len, 8);
                     break;
                 case HOIOCHARSET:
@@ -336 +365 @@
 
 static void
-convertcp (char *in_codeset, char *host_name, struct vbsf_mount_info *info)
+convertcp (char *in_codeset, char *host_name, struct vbsf_mount_info_new *info)
 {
     char *i = host_name;
@@ -373 +402 @@
            "  -w                    mount the shared folder writably (the default)\n"
            "  -r                    mount the shared folder read-only\n"
-           "  -n                    do not add information about the folder to the mtab file\n"
+           "  -n                    do not create an mtab entry\n"
            "  -o OPTION[,OPTION...] use the mount options specified\n"
            "\n", name);
     printf("Available mount options are:\n"
-           "\n"
            "     rw                 mount writably (the default)\n"
            "     ro                 mount read only\n"
            "     uid=UID            set the default file owner user id to UID\n"
            "     gid=GID            set the default file owner group id to GID\n"
-           "     ttl=TTL            set the \"time to live\" to TID for the dentry\n"
-           "     iocharset CHARSET  use the character set CHARSET for i/o operations (default utf8)\n"
-           "     convertcp CHARSET  convert the shared folder name from the character set CHARSET to utf8\n");
+           "     ttl=TTL            set the \"time to live\" to TID for the dentry\n");
+    printf("     dmode=MODE         override the mode of all directories to (octal) MODE\n"
+           "     fmode=MODE         override the mode of all regular files to (octal) MODE\n"
+           "     umask=UMASK        set the umask to (octal) UMASK\n");
+    printf("     dmask=UMASK        set the umask applied to directories only\n"
+           "     fmask=UMASK        set the umask applied to regular files only\n"
+           "     iocharset CHARSET  use the character set CHARSET for I/O operations\n"
+           "                        (default set is utf8)\n"
+           "     convertcp CHARSET  convert the folder name from CHARSET to utf8\n"
+           "\n");
     printf("Less common used options:\n"
            "     noexec,exec,nodev,dev,nosuid,suid\n");
@@ -399 +434 @@
     char *host_name;
     char *mount_point;
-    struct vbsf_mount_info mntinf;
-    struct opts opts = {
+    struct vbsf_mount_info_new mntinf;
+    struct opts opts =
+    {
         0,     /* uid */
         0,     /* gid */
         0,     /* ttl */
+       ~0,     /* dmode */
+       ~0,     /* fmode*/
+        0,     /* dmask */
+        0,     /* fmask */
         0,     /* ronly */
         0,     /* noexec */
@@ -413 +453 @@
     };
 
+    mntinf.nullchar = '\0';
+    mntinf.signature[0] = VBSF_MOUNT_SIGNATURE_BYTE_0;
+    mntinf.signature[1] = VBSF_MOUNT_SIGNATURE_BYTE_1;
+    mntinf.signature[2] = VBSF_MOUNT_SIGNATURE_BYTE_2;
+
     if (getuid ())
         panic ("Only root can mount shared folders from the host.\n");
@@ -476 +521 @@
         flags |= MS_NODEV;
 
-    mntinf.uid = opts.uid;
-    mntinf.gid = opts.gid;
-    mntinf.ttl = opts.ttl;
+    mntinf.uid   = opts.uid;
+    mntinf.gid   = opts.gid;
+    mntinf.ttl   = opts.ttl;
+    mntinf.dmode = opts.dmode;
+    mntinf.fmode = opts.fmode;
+    mntinf.dmask = opts.dmask;
+    mntinf.fmask = opts.fmask;
 
     err = mount (NULL, 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 (NULL, mount_point, "vboxsf", flags, &mntinf_old);
+    }
     if (err)
         panic_err ("%s: mounting failed with the error", argv[0]);

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

@@ -63 +63 @@
         }
 
+        /** XXX Check read permission accoring to inode->i_mode! */
+
         if (!size) {
                 return 0;
@@ -133 +135 @@
         }
 
+        /** XXX Check write permission accoring to inode->i_mode! */
+
         if (!size) {
                 return 0;
@@ -139 +143 @@
         tmp = kmalloc (CHUNK_SIZE, GFP_KERNEL);
         if (!tmp) {
-                LogRelFunc(("could not allocate bounce buffer memory %d\n", CHUNK_SIZE));
+                LogRelFunc(("could not allocate bounce buffer memory %d bytes\n", CHUNK_SIZE));
                 return -ENOMEM;
         }

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

@@ -111 +111 @@
 
         if (is_dir) {
-                inode->i_mode = S_IFDIR | mode;
-                inode->i_op = &sf_dir_iops;
-                inode->i_fop = &sf_dir_fops;
+                inode->i_mode  = sf_g->dmode != ~0 ? (sf_g->dmode & 0777) : mode;
+                inode->i_mode &= ~sf_g->dmask;
+                inode->i_mode |= S_IFDIR;
+                inode->i_op    = &sf_dir_iops;
+                inode->i_fop   = &sf_dir_fops;
                 /* XXX: this probably should be set to the number of entries
                    in the directory plus two (. ..) */
@@ -119 +121 @@
         }
         else {
-                inode->i_mode = S_IFREG | mode;
-                inode->i_op = &sf_reg_iops;
-                inode->i_fop = &sf_reg_fops;
+                inode->i_mode  = sf_g->fmode != ~0 ? (sf_g->fmode & 0x777): mode;
+                inode->i_mode &= ~sf_g->fmask;
+                inode->i_mode |= S_IFREG;
+                inode->i_op    = &sf_reg_iops;
+                inode->i_fop   = &sf_reg_fops;
                 inode->i_nlink = 1;
         }

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

@@ -22 +22 @@
 #define VBFS_MOUNT_H
 
-#define MAX_HOST_NAME 256
-#define MAX_NLS_NAME 32
+#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 {
+struct vbsf_mount_info_old
+{
     char name[MAX_HOST_NAME];
     char nls_name[MAX_NLS_NAME];
-    int uid;
-    int gid;
-    int ttl;
+    int  uid;
+    int  gid;
+    int  ttl;
+};
+
+#define VBSF_MOUNT_SIGNATURE_BYTE_0 '\377'
+#define VBSF_MOUNT_SIGNATURE_BYTE_1 '\376'
+#define VBSF_MOUNT_SIGNATURE_BYTE_2 '\375'
+
+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 */
+    char signature[3];          /* signature */
+    int  length;                /* length of the whole structure */
+    char name[MAX_HOST_NAME];   /* share name */
+    char nls_name[MAX_NLS_NAME];/* name of an I/O charset */
+    int  uid;                   /* user ID for all entries, default 0=root */
+    int  gid;                   /* group ID for all entries, default 0=root */
+    int  ttl;                   /* time to live */
+    int  dmode;                 /* mode for directories if != 0xffffffff */
+    int  fmode;                 /* mode for regular files if != 0xffffffff */
+    int  dmask;                 /* umask applied to directories */
+    int  fmask;                 /* umask applied to regular files */
 };
 

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

@@ -69 +69 @@
 /* allocate global info, try to map host share */
 static int
-sf_glob_alloc (struct vbsf_mount_info *info, struct sf_glob_info **sf_gp)
+sf_glob_alloc (struct vbsf_mount_info_new *info, struct sf_glob_info **sf_gp)
 {
         int err, rc;
@@ -82 +82 @@
                 LogRelFunc(("could not allocate memory for global info\n"));
                 goto fail0;
+        }
+
+        memset(sf_g, sizeof(*sf_g), 0);
+
+        if (   info->nullchar     != '\0'
+            || info->signature[0] != VBSF_MOUNT_SIGNATURE_BYTE_0
+            || info->signature[1] != VBSF_MOUNT_SIGNATURE_BYTE_1
+            || 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, sizeof(*info), 0);
+            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;
         }
 
@@ -127 +149 @@
         }
 
-        sf_g->ttl = info->ttl;
-        sf_g->uid = info->uid;
-        sf_g->gid = info->gid;
+        sf_g->ttl   = info->ttl;
+        sf_g->uid   = info->uid;
+        sf_g->gid   = info->gid;
+
+        if (info->length >= sizeof(struct vbsf_mount_info_new))
+        {
+            /* new fields */
+            sf_g->dmode = info->dmode;
+            sf_g->fmode = info->fmode;
+            sf_g->dmask = info->dmask;
+            sf_g->fmask = info->fmask;
+        }
+        else
+        {
+            sf_g->dmode = ~0;
+            sf_g->fmode = ~0;
+        }
 
         *sf_gp = sf_g;
@@ -180 +216 @@
         struct sf_glob_info *sf_g;
         RTFSOBJINFO fsinfo;
-        struct vbsf_mount_info *info;
+        struct vbsf_mount_info_new *info;
 
         TRACE ();
@@ -415 +451 @@
         TRACE ();
 
-        if (sizeof (struct vbsf_mount_info) > PAGE_SIZE) {
+        if (sizeof (struct vbsf_mount_info_old) > PAGE_SIZE) {
                 printk (KERN_ERR
                         "Mount information structure is too large %lu\n"
                         "Must be less than or equal to %lu\n",
-                        (unsigned long)sizeof (struct vbsf_mount_info),
+                        (unsigned long)sizeof (struct vbsf_mount_info_old),
                         PAGE_SIZE);
                 return -EINVAL;

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

@@ -36 +36 @@
         int uid;
         int gid;
+        int dmode;
+        int fmode;
+        int dmask;
+        int fmask;
 };