Changeset 91b60499 in mainline for kernel/generic/src/ipc/kbox.c

Timestamp:

2017-09-30T06:29:42Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

300f4c4

Parents:

d076f16 (diff), 6636fb19 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge support for capabilities from lp:~jakub/helenos/caps

This commit introduces capabilities as task-local names for references to kernel
objects. Kernel objects are reference-counted wrappers for a select group of
objects allocated in and by the kernel that can be made accessible to userspace
in a controlled way via integer handles.

So far, a kernel object encapsulates either an irq_t or a phone_t.

Support for the former lead to the removal of kernel-assigned devnos and
unsecure deregistration of IRQs in which a random task was able to unregister
some other task's IRQ.

File:

• kernel/generic/src/ipc/kbox.c (modified) (3 diffs)

kernel/generic/src/ipc/kbox.c

@@ -206 +206 @@
  * cleanup code.
  *
- * @return Phone id on success, or negative error code.
+ * @return Phone capability handle on success, or negative error code.
  *
  */
@@ -236 +236 @@
         }
         
-        int newphid = phone_alloc(TASK);
-        if (newphid < 0) {
-                mutex_unlock(&task->kb.cleanup_lock);
-                return ELIMIT;
-        }
-        
+        cap_handle_t phone_handle = phone_alloc(TASK);
+        if (phone_handle < 0) {
+                mutex_unlock(&task->kb.cleanup_lock);
+                return phone_handle;
+        }
+        
+        kobject_t *phone_obj = kobject_get(TASK, phone_handle,
+            KOBJECT_TYPE_PHONE);
         /* Connect the newly allocated phone to the kbox */
-        (void) ipc_phone_connect(&TASK->phones[newphid], &task->kb.box);
+        /* Hand over phone_obj's reference to ipc_phone_connect() */
+        (void) ipc_phone_connect(phone_obj->phone, &task->kb.box);
         
         if (task->kb.thread != NULL) {
                 mutex_unlock(&task->kb.cleanup_lock);
-                return newphid;
+                return phone_handle;
         }
         
@@ -263 +266 @@
         mutex_unlock(&task->kb.cleanup_lock);
         
-        return newphid;
+        return phone_handle;
 }