Changeset 91b60499 in mainline for kernel/generic/src/ipc/ops/stchngath.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/ops/stchngath.c (modified) (3 diffs)

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

@@ -43 +43 @@
 static int request_preprocess(call_t *call, phone_t *phone)
 {
-        phone_t *sender_phone;
         task_t *other_task_s;
 
-        if (phone_get(IPC_GET_ARG5(call->data), &sender_phone) != EOK)
+        kobject_t *sender_obj = kobject_get(TASK, IPC_GET_ARG5(call->data),
+            KOBJECT_TYPE_PHONE);
+        if (!sender_obj)
                 return ENOENT;
 
-        mutex_lock(&sender_phone->lock);
-        if (sender_phone->state != IPC_PHONE_CONNECTED) {
-                mutex_unlock(&sender_phone->lock);
+        mutex_lock(&sender_obj->phone->lock);
+        if (sender_obj->phone->state != IPC_PHONE_CONNECTED) {
+                mutex_unlock(&sender_obj->phone->lock);
+                kobject_put(sender_obj);
                 return EINVAL;
         }
 
-        other_task_s = sender_phone->callee->task;
+        other_task_s = sender_obj->phone->callee->task;
 
-        mutex_unlock(&sender_phone->lock);
+        mutex_unlock(&sender_obj->phone->lock);
 
         /* Remember the third party task hash. */
         IPC_SET_ARG5(call->data, (sysarg_t) other_task_s);
 
+        kobject_put(sender_obj);
         return EOK;
 }
@@ -71 +74 @@
         if (!IPC_GET_RETVAL(answer->data)) {
                 /* The recipient authorized the change of state. */
-                phone_t *recipient_phone;
                 task_t *other_task_s;
                 task_t *other_task_r;
 
-                rc = phone_get(IPC_GET_ARG1(answer->data),
-                    &recipient_phone);
-                if (rc != EOK) {
+                kobject_t *recipient_obj = kobject_get(TASK,
+                    IPC_GET_ARG1(answer->data), KOBJECT_TYPE_PHONE);
+                if (!recipient_obj) {
                         IPC_SET_RETVAL(answer->data, ENOENT);
                         return ENOENT;
                 }
 
-                mutex_lock(&recipient_phone->lock);
-                if (recipient_phone->state != IPC_PHONE_CONNECTED) {
-                        mutex_unlock(&recipient_phone->lock);
+                mutex_lock(&recipient_obj->phone->lock);
+                if (recipient_obj->phone->state != IPC_PHONE_CONNECTED) {
+                        mutex_unlock(&recipient_obj->phone->lock);
                         IPC_SET_RETVAL(answer->data, EINVAL);
+                        kobject_put(recipient_obj);
                         return EINVAL;
                 }
 
-                other_task_r = recipient_phone->callee->task;
+                other_task_r = recipient_obj->phone->callee->task;
                 other_task_s = (task_t *) IPC_GET_ARG5(*olddata);
 
@@ -110 +113 @@
                 }
 
-                mutex_unlock(&recipient_phone->lock);
+                mutex_unlock(&recipient_obj->phone->lock);
+                kobject_put(recipient_obj);
         }