Changeset c990ee6 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2017-03-21T19:20:30Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e4e546b

Parents:

ebf1011

Message:

Handle vfs_node_get() returning NULL

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -186 +186 @@
                 return rc;
         }
+
         async_wait_for(msg, &rc);
-        vfs_exchange_release(exch);
-        
-        if (rc != EOK)
+        if (rc != EOK) {
+                vfs_exchange_release(exch);
                 return rc;
+        }
         
         vfs_lookup_res_t res;
@@ -202 +203 @@
         /* Add reference to the mounted root. */
         *root = vfs_node_get(&res); 
-        assert(*root);
+        if (!*root) {
+                aid_t msg = async_send_1(exch, VFS_OUT_UNMOUNTED,
+                    (sysarg_t) service_id, NULL);
+                async_forget(msg);
+                vfs_exchange_release(exch);
+                return ENOMEM;
+        }
                         
+        vfs_exchange_release(exch);
+
         return EOK;
 }
@@ -541 +550 @@
                 vfs_node_put(base);
                 base = vfs_node_get(&base_lr);
+                if (!base) {
+                        fibril_rwlock_write_unlock(&namespace_rwlock);
+                        return ENOMEM;
+                }
                 old[shared] = '/';
                 old += shared;
@@ -904 +917 @@
         int rc = vfs_lookup_internal(parent->node, path,
             walk_lookup_flags(flags), &lr);
-
         if (rc != EOK) {
                 fibril_rwlock_read_unlock(&namespace_rwlock);
@@ -912 +924 @@
         
         vfs_node_t *node = vfs_node_get(&lr);
+        if (!node) {
+                fibril_rwlock_read_unlock(&namespace_rwlock);
+                vfs_file_put(parent);
+                return ENOMEM;
+        }
         
         vfs_file_t *file;