Add support for quoted mount options

The patch avoid the collision between commas in security contexts and the
delimiter between mount options.

Try:
	mount.nfs foo://mnt/bar /mnt/bar -o context=\"aaa,bbb,ccc\",ro

Signed-off-by: Cory Olmo <colmo@TrustedCS.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index c6644b1cde10b24a2be3c31ac138c21bc29c996f..487c0a62bc20f5d7edf02a72334423c1ee30702a 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -261,18 +261,30 @@ static void parse_opts (const char *options, int *flags, char **extra_opts)
 {
        if (options != NULL) {
                char *opts = xstrdup(options);
-               char *opt;
-               int len = strlen(opts) + 20;
+               char *opt, *p;
+               int len = strlen(opts);
+               int open_quote = 0;
 
                *extra_opts = xmalloc(len);
                **extra_opts = '\0';
 
-               for (opt = strtok(opts, ","); opt; opt = strtok(NULL, ","))
-                       parse_opt(opt, flags, *extra_opts, len);
-
+               for (p=opts, opt=NULL; p && *p; p++) {
+                       if (!opt)
+                               opt = p;                /* begin of the option item */
+                       if (*p == '"')
+                               open_quote ^= 1;        /* reverse the status */
+                       if (open_quote)
+                               continue;               /* still in a quoted block */
+                       if (*p == ',')
+                               *p = '\0';              /* terminate the option item */
+                       /* end of option item or last item */
+                       if (*p == '\0' || *(p+1) == '\0') {
+                               parse_opt(opt, flags, *extra_opts, len);
+                               opt = NULL;
+                       }
+               }
                free(opts);
        }
-
 }
 
 static void mount_error(char *node)

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index eac9590f5610d836045fcb2aeaf60e54f86804d7..4049e662ca2d81c16f6049b27b16e058a51fc682 100644 (file)
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -548,15 +548,31 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
        struct pmap *mnt_pmap = &mnt_server->pmap;
        struct pmap *nfs_pmap = &nfs_server->pmap;
        int len;
-       char *opt, *opteq;
+       char *opt, *opteq, *p, *opt_b;
        char *mounthost = NULL;
        char cbuf[128];
+       int open_quote = 0;
 
        data->flags = 0;
        *bg = 0;
 
        len = strlen(new_opts);
-       for (opt = strtok(old_opts, ","); opt; opt = strtok(NULL, ",")) {
+       for (p=old_opts, opt_b=NULL; p && *p; p++) {
+               if (!opt_b)
+                       opt_b = p;              /* begin of the option item */
+               if (*p == '"')
+                       open_quote ^= 1;        /* reverse the status */
+               if (open_quote)
+                       continue;               /* still in a quoted block */
+               if (*p == ',')
+                       *p = '\0';              /* terminate the option item */
+               if (*p == '\0' || *(p+1) == '\0') {
+                       opt = opt_b;            /* opt is useful now */
+                       opt_b = NULL;
+               }
+               else
+                       continue;               /* still somewhere in the option item */
+
                if (strlen(opt) >= sizeof(cbuf))
                        goto bad_parameter;
                if ((opteq = strchr(opt, '=')) && isdigit(opteq[1])) {
@@ -680,14 +696,24 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
                                mounthost=xstrndup(opteq+1,
                                                   strcspn(opteq+1," \t\n\r,"));
                         else if (!strcmp(opt, "context")) {
-                               char *context = opteq + 1;
-                               
-                               if (strlen(context) > NFS_MAX_CONTEXT_LEN) {
-                                       printf(_("context parameter exceeds limit of %d\n"),
-                                                NFS_MAX_CONTEXT_LEN);
+                               char *context = opteq + 1;
+                               int ctxlen = strlen(context);
+
+                               if (ctxlen > NFS_MAX_CONTEXT_LEN) {
+                                       printf(_("context parameter exceeds limit of %d\n"),
+                                                NFS_MAX_CONTEXT_LEN);
                                        goto bad_parameter;
-                               }
-                               strncpy(data->context, context, NFS_MAX_CONTEXT_LEN);
+                               }
+                               /* The context string is in the format of
+                                * "system_u:object_r:...".  We only want
+                                * the context str between the quotes.
+                                */
+                               if (*context == '"')
+                                       strncpy(data->context, context+1,
+                                                       ctxlen-2);
+                               else
+                                       strncpy(data->context, context,
+                                                       NFS_MAX_CONTEXT_LEN);
                        } else if (sloppy)
                                continue;
                        else