Changeset d6084ef in mainline

Timestamp:

2008-03-02T15:05:26Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dadcec1

Parents:

9bb85f3

Message:

Make VFS canonify path names on lookup.

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (1 diff)
• vfs_lookup.c (modified) (8 diffs)
• vfs_ops.c (modified) (11 diffs)

uspace/srv/vfs/vfs.h

@@ -251 +251 @@
 extern int fs_name_to_handle(char *, bool);
 
-extern int vfs_lookup_internal(char *, size_t, int, vfs_lookup_res_t *,
-    vfs_pair_t *);
+extern int vfs_lookup_internal(char *, int, vfs_lookup_res_t *, vfs_pair_t *);
 
 extern bool vfs_nodes_init(void);

uspace/srv/vfs/vfs_lookup.c

@@ -50 +50 @@
 
 /* Forward static declarations. */
-static char *canonify(char *path);
+static char *canonify(char *path, size_t *lenp);
 
 atomic_t plb_futex = FUTEX_INITIALIZER;
@@ -58 +58 @@
 /** Perform a path lookup.
  *
- * @param path          Path to be resolved; it needn't be an ASCIIZ string.
- * @param len           Number of path characters pointed by path.
+ * @param path          Path to be resolved; it must be a NULL-terminated
+ *                      string.
  * @param lflag         Flags to be used during lookup.
  * @param result        Empty structure where the lookup result will be stored.
@@ -68 +68 @@
  * @return              EOK on success or an error code from errno.h.
  */
-int vfs_lookup_internal(char *path, size_t len, int lflag,
-    vfs_lookup_res_t *result, vfs_pair_t *altroot)
+int vfs_lookup_internal(char *path, int lflag, vfs_lookup_res_t *result,
+    vfs_pair_t *altroot)
 {
         vfs_pair_t *root;
-
-        if (!len)
-                return EINVAL;
 
         if (altroot)
@@ -83 +80 @@
         if (!root->fs_handle)
                 return ENOENT;
+        
+        size_t len;
+        path = canonify(path, &len);
+        if (!path)
+                return EINVAL;
         
         futex_down(&plb_futex);
@@ -274 +276 @@
 static void terminate_slash(token_t *t, token_t *tfsl, token_t *tlcomp)
 {
-        tfsl->stop[1] = '\0';
+        if (tfsl->stop[1])      /* avoid writing to a well-formatted path */
+                tfsl->stop[1] = '\0';
 }
 static void remove_trailing_slash(token_t *t, token_t *tfsl, token_t *tlcomp)
@@ -435 +438 @@
  * It works in-place and requires a NULL-terminated input string.
  *
- * @param               Path to be canonified.
+ * @param path          Path to be canonified.
+ * @param lenp          Pointer where the length of the final path will be
+ *                      stored. Can be NULL.
  *
  * @return              Canonified path or NULL on failure.
  */
-char *canonify(char *path)
+char *canonify(char *path, size_t *lenp)
 {
         state_t state;
@@ -451 +456 @@
         state = S_INI;
         t = tfsl;
+        tlcomp = tfsl;
         while (state != S_ACCEPT && state != S_RESTART && state != S_REJECT) {
                 if (trans[state][t.kind].f)
@@ -464 +470 @@
                 return NULL;
         case S_ACCEPT:
+                if (lenp)
+                        *lenp = (size_t)((tlcomp.stop - tfsl.start) + 1);
                 return tfsl.start; 
         default:

uspace/srv/vfs/vfs_ops.c

@@ -76 +76 @@
         };
 
-        return vfs_lookup_internal("/", strlen("/"), L_DIRECTORY, result,
-            &altroot);
+        return vfs_lookup_internal("/", L_DIRECTORY, result, &altroot);
 }
 
@@ -150 +149 @@
         /* Allocate buffer for the mount point data being received. */
         uint8_t *buf;
-        buf = malloc(size);
+        buf = malloc(size + 1);
         if (!buf) {
                 ipc_answer_0(callid, ENOMEM);
@@ -159 +158 @@
         /* Deliver the mount point. */
         (void) ipc_data_write_finalize(callid, buf, size);
+        buf[size] = '\0';
 
         /*
@@ -187 +187 @@
                 /* We already have the root FS. */
                 rwlock_write_lock(&namespace_rwlock);
-                rc = vfs_lookup_internal(buf, size, L_DIRECTORY, &mp_res,
-                    NULL);
+                rc = vfs_lookup_internal(buf, L_DIRECTORY, &mp_res, NULL);
                 if (rc != EOK) {
                         /* The lookup failed for some reason. */
@@ -315 +314 @@
          * directly into the PLB using some kind of a callback.
          */
-        char *path = malloc(len);
+        char *path = malloc(len + 1);
         
         if (!path) {
@@ -329 +328 @@
                 return;
         }
+        path[len] = '\0';
         
         /*
@@ -342 +342 @@
         /* The path is now populated and we can call vfs_lookup_internal(). */
         vfs_lookup_res_t lr;
-        rc = vfs_lookup_internal(path, len, lflag, &lr, NULL);
+        rc = vfs_lookup_internal(path, lflag, &lr, NULL);
         if (rc) {
                 if (lflag & L_CREATE)
@@ -637 +637 @@
          * directly into the PLB using some kind of a callback.
          */
-        char *path = malloc(len);
+        char *path = malloc(len + 1);
         
         if (!path) {
@@ -651 +651 @@
                 return;
         }
+        path[len] = '\0';
         
         rwlock_write_lock(&namespace_rwlock);
         int lflag = L_DIRECTORY | L_CREATE | L_EXCLUSIVE;
-        rc = vfs_lookup_internal(path, len, lflag, NULL, NULL);
+        rc = vfs_lookup_internal(path, lflag, NULL, NULL);
         rwlock_write_unlock(&namespace_rwlock);
         free(path);
@@ -679 +680 @@
          * directly into the PLB using some kind of a callback.
          */
-        char *path = malloc(len);
+        char *path = malloc(len + 1);
         
         if (!path) {
@@ -693 +694 @@
                 return;
         }
+        path[len] = '\0';
         
         rwlock_write_lock(&namespace_rwlock);
         lflag &= L_DIRECTORY;   /* sanitize lflag */
         vfs_lookup_res_t lr;
-        rc = vfs_lookup_internal(path, len, lflag | L_DESTROY, &lr, NULL);
+        rc = vfs_lookup_internal(path, lflag | L_DESTROY, &lr, NULL);
         free(path);
         if (rc != EOK) {