Changeset 984a9ba in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2018-07-05T09:34:09Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

63d46341

Parents:

76f566d

Message:

do not expose the call capability handler from the async framework

Keep the call capability handler encapsulated within the async framework
and do not expose it explicitly via its API. Use the pointer to
ipc_call_t as the sole object identifying an IPC call in the code that
uses the async framework.

This plugs a major leak in the abstraction and also simplifies both the
async framework (slightly) and all IPC servers.

File:

• uspace/srv/vfs/vfs_register.c (modified) (11 diffs)

uspace/srv/vfs/vfs_register.c

@@ -108 +108 @@
 /** VFS_REGISTER protocol function.
  *
- * @param req_handle  Call handle of the request.
- * @param request     Call structure with the request.
- *
- */
-void vfs_register(cap_call_handle_t req_handle, ipc_call_t *request)
+ * @param req Call structure with the request.
+ *
+ */
+void vfs_register(ipc_call_t *req)
 {
         dprintf("Processing VFS_REGISTER request received from %zx.\n",
-            request->in_phone_hash);
+            req->in_phone_hash);
 
         vfs_info_t *vfs_info;
@@ -124 +123 @@
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
                     rc);
-                async_answer_0(req_handle, rc);
+                async_answer_0(req, rc);
                 return;
         }
@@ -134 +133 @@
         if (!fs_info) {
                 dprintf("Could not allocate memory for FS info.\n");
-                async_answer_0(req_handle, ENOMEM);
+                async_answer_0(req, ENOMEM);
                 return;
         }
@@ -146 +145 @@
         if (!vfs_info_sane(&fs_info->vfs_info)) {
                 free(fs_info);
-                async_answer_0(req_handle, EINVAL);
+                async_answer_0(req, EINVAL);
                 return;
         }
@@ -163 +162 @@
                 fibril_mutex_unlock(&fs_list_lock);
                 free(fs_info);
-                async_answer_0(req_handle, EEXIST);
+                async_answer_0(req, EEXIST);
                 return;
         }
@@ -184 +183 @@
                 fibril_mutex_unlock(&fs_list_lock);
                 free(fs_info);
-                async_answer_0(req_handle, EINVAL);
+                async_answer_0(req, EINVAL);
                 return;
         }
@@ -194 +193 @@
          */
 
+        ipc_call_t call;
         size_t size;
-        cap_call_handle_t chandle;
-        if (!async_share_in_receive(&chandle, &size)) {
+        if (!async_share_in_receive(&call, &size)) {
                 dprintf("Unexpected call\n");
                 list_remove(&fs_info->fs_link);
@@ -202 +201 @@
                 async_hangup(fs_info->sess);
                 free(fs_info);
-                async_answer_0(chandle, EINVAL);
-                async_answer_0(req_handle, EINVAL);
+                async_answer_0(&call, EINVAL);
+                async_answer_0(req, EINVAL);
                 return;
         }
@@ -216 +215 @@
                 async_hangup(fs_info->sess);
                 free(fs_info);
-                async_answer_0(chandle, EINVAL);
-                async_answer_0(req_handle, EINVAL);
+                async_answer_0(&call, EINVAL);
+                async_answer_0(req, EINVAL);
                 return;
         }
@@ -224 +223 @@
          * Commit to read-only sharing the PLB with the client.
          */
-        (void) async_share_in_finalize(chandle, plb,
+        (void) async_share_in_finalize(&call, plb,
             AS_AREA_READ | AS_AREA_CACHEABLE);
 
@@ -235 +234 @@
          */
         fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
-        async_answer_1(req_handle, EOK, (sysarg_t) fs_info->fs_handle);
+        async_answer_1(req, EOK, (sysarg_t) fs_info->fs_handle);
 
         fibril_condvar_broadcast(&fs_list_cv);