Changeset 460514d in mainline

Timestamp:

2011-11-06T13:00:26Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

4f100f4

Parents:

4af2f36

Message:

mount() should fail if there is not enough memory to add the respective entry to the mtab list

File:

• uspace/srv/vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -359 +359 @@
         fibril_mutex_unlock(&fs_list_lock);
 
-        /* Do the mount */
-        rc = vfs_mount_internal(rid, service_id, fs_handle, mp, opts);
-        if (rc != EOK) {
-                async_answer_0(callid, ENOTSUP);
-                async_answer_0(rid, ENOTSUP);
-                free(mp);
-                free(opts);
-                free(fs_name);
-                return;
-        }
-
         /* Add the filesystem info to the list of mounted filesystems */
         mtab_ent_t *mtab_ent = malloc(sizeof(mtab_ent_t));
@@ -380 +369 @@
                 return;
         }
+
+        /* Do the mount */
+        rc = vfs_mount_internal(rid, service_id, fs_handle, mp, opts);
+        if (rc != EOK) {
+                async_answer_0(callid, ENOTSUP);
+                async_answer_0(rid, ENOTSUP);
+                free(mtab_ent);
+                free(mp);
+                free(opts);
+                free(fs_name);
+                return;
+        }
+
+        /* Add the filesystem info to the list of mounted filesystems */
 
         str_cpy(mtab_ent->mp, MAX_PATH_LEN, mp);