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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Ondrej Palkovsky
- * Copyright (c) 2012 Jakub Jermar 
+ * Copyright (c) 2012 Jakub Jermar
  * All rights reserved.
  *
@@ -42 +42 @@
 static int request_process(call_t *call, answerbox_t *box)
 {
-        int phoneid = phone_alloc(TASK);
+        cap_handle_t phone_handle = phone_alloc(TASK);
 
-        IPC_SET_ARG5(call->data, phoneid);
+        IPC_SET_ARG5(call->data, phone_handle);
         
         return EOK;
@@ -51 +51 @@
 static int answer_cleanup(call_t *answer, ipc_data_t *olddata)
 {
-        int phoneid = (int) IPC_GET_ARG5(*olddata);
+        cap_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
 
-        if (phoneid >= 0)
-                phone_dealloc(phoneid);
+        if (phone_handle >= 0)
+                phone_dealloc(phone_handle);
 
         return EOK;
@@ -61 +61 @@
 static int answer_preprocess(call_t *answer, ipc_data_t *olddata)
 {
-        int phoneid = (int) IPC_GET_ARG5(*olddata);
+        cap_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
 
         if (IPC_GET_RETVAL(answer->data) != EOK) {
                 /* The connection was not accepted */
                 answer_cleanup(answer, olddata);
-        } else if (phoneid >= 0) {
+        } else if (phone_handle >= 0) {
                 /* The connection was accepted */
-                if (phone_connect(phoneid, &answer->sender->answerbox)) {
-                        /* Set 'phone hash' as arg5 of response */
+                if (phone_connect(phone_handle, &answer->sender->answerbox)) {
+                        /* Set 'phone hash' as ARG5 of response */
+                        kobject_t *phone_obj = kobject_get(TASK, phone_handle,
+                            KOBJECT_TYPE_PHONE);
                         IPC_SET_ARG5(answer->data,
-                            (sysarg_t) &TASK->phones[phoneid]);
+                            (sysarg_t) phone_obj->phone);
+                        kobject_put(phone_obj);
                 } else {
                         /* The answerbox is shutting down. */