Changeset eadaeae8 in mainline for kernel/generic/src/ipc/ops

Timestamp:

2018-03-21T20:58:49Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3be9d10

Parents:

874381a

Message:

Make capability handles type-safe

Define distinct pointer types for the handles of the supported
capability types and use them instead of integer handles. This makes it
virtually impossible to pass a non-handle or a handle of different type
instead of the proper handle. Also turn cap_handle_t into an "untyped"
capability handle that can be assigned to and from the "typed" handles.

This commit also fixes a bug in msim-con driver, which wrongly used the
IRQ number instead of the IRQ capability handle to unregister the IRQ.

This commit also fixes the wrong use of the capability handle instead
of error code in libusbhost.

Location:

kernel/generic/src/ipc/ops

Files:

• conctmeto.c (modified) (5 diffs)
• concttome.c (modified) (4 diffs)
• stchngath.c (modified) (2 diffs)

kernel/generic/src/ipc/ops/conctmeto.c

@@ -46 +46 @@
          * That will be done once the phone is connected.
          */
-        cap_handle_t phone_handle;
+        cap_phone_handle_t phone_handle;
         kobject_t *phone_obj;
         errno_t rc = phone_alloc(TASK, false, &phone_handle, &phone_obj);
@@ -58 +58 @@
 
         /* Remember the handle */
-        call->priv = phone_handle;
+        call->priv = CAP_HANDLE_RAW(phone_handle);
 
         return EOK;
@@ -65 +65 @@
 static errno_t request_forget(call_t *call)
 {
-        cap_handle_t phone_handle = (cap_handle_t) call->priv;
+        cap_phone_handle_t phone_handle = (cap_handle_t) call->priv;
 
-        if (phone_handle < 0)
+        if (CAP_HANDLE_RAW(phone_handle) < 0)
                 return EOK;
 
@@ -103 +103 @@
 static errno_t answer_process(call_t *answer)
 {
-        cap_handle_t phone_handle = (cap_handle_t) answer->priv;
+        cap_phone_handle_t phone_handle = (cap_handle_t) answer->priv;
         phone_t *phone = (phone_t *) IPC_GET_ARG5(answer->data);
 
         if (IPC_GET_RETVAL(answer->data)) {
-                if (phone_handle >= 0) {
+                if (CAP_HANDLE_RAW(phone_handle) >= 0) {
                         /*
                          * Cleanup the unpublished capability and drop
@@ -123 +123 @@
                 cap_publish(TASK, phone_handle, phone->kobject);
 
-                IPC_SET_ARG5(answer->data, phone_handle);
+                IPC_SET_ARG5(answer->data, CAP_HANDLE_RAW(phone_handle));
         }
 

kernel/generic/src/ipc/ops/concttome.c

@@ -42 +42 @@
 static int request_process(call_t *call, answerbox_t *box)
 {
-        cap_handle_t phone_handle;
+        cap_phone_handle_t phone_handle;
         kobject_t *phone_obj;
         errno_t rc = phone_alloc(TASK, false, &phone_handle, &phone_obj);
         call->priv = (sysarg_t) phone_obj;
-        IPC_SET_ARG5(call->data, (rc == EOK) ? phone_handle : -1);
+        IPC_SET_ARG5(call->data,
+            (rc == EOK) ? CAP_HANDLE_RAW(phone_handle) : CAP_NIL);
         return 0;
 }
@@ -52 +53 @@
 static errno_t answer_cleanup(call_t *answer, ipc_data_t *olddata)
 {
-        cap_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
+        cap_phone_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
         kobject_t *phone_obj = (kobject_t *) answer->priv;
 
-        if (phone_handle >= 0) {
+        if (CAP_HANDLE_VALID(phone_handle)) {
                 kobject_put(phone_obj);
                 cap_free(TASK, phone_handle);
@@ -65 +66 @@
 static errno_t answer_preprocess(call_t *answer, ipc_data_t *olddata)
 {
-        cap_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
+        cap_phone_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
         kobject_t *phone_obj = (kobject_t *) answer->priv;
 
@@ -71 +72 @@
                 /* The connection was not accepted */
                 answer_cleanup(answer, olddata);
-        } else if (phone_handle >= 0) {
+        } else if (CAP_HANDLE_VALID(phone_handle)) {
                 /*
                  * The connection was accepted

kernel/generic/src/ipc/ops/stchngath.c

@@ -45 +45 @@
         task_t *other_task_s;
 
-        kobject_t *sender_obj = kobject_get(TASK, IPC_GET_ARG5(call->data),
-            KOBJECT_TYPE_PHONE);
+        kobject_t *sender_obj = kobject_get(TASK,
+            (cap_handle_t) IPC_GET_ARG5(call->data), KOBJECT_TYPE_PHONE);
         if (!sender_obj)
                 return ENOENT;
@@ -78 +78 @@
 
                 kobject_t *recipient_obj = kobject_get(TASK,
-                    IPC_GET_ARG1(answer->data), KOBJECT_TYPE_PHONE);
+                    (cap_handle_t) IPC_GET_ARG1(answer->data),
+                    KOBJECT_TYPE_PHONE);
                 if (!recipient_obj) {
                         IPC_SET_RETVAL(answer->data, ENOENT);