Changeset eadaeae8 in mainline for kernel/generic/src/cap/cap.c

Timestamp:

2018-03-21T20:58:49Z (7 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.

File:

• kernel/generic/src/cap/cap.c (modified) (5 diffs)

kernel/generic/src/cap/cap.c

@@ -92 +92 @@
 {
         cap_t *cap = hash_table_get_inst(item, cap_t, caps_link);
-        return hash_mix(cap->handle);
+        return hash_mix(CAP_HANDLE_RAW(cap->handle));
 }
 
@@ -98 +98 @@
 {
         cap_handle_t *handle = (cap_handle_t *) key;
-        return hash_mix(*handle);
+        return hash_mix(CAP_HANDLE_RAW(*handle));
 }
 
@@ -224 +224 @@
         assert(mutex_locked(&task->cap_info->lock));
 
-        if ((handle < CAPS_START) || (handle > CAPS_LAST))
+        if ((CAP_HANDLE_RAW(handle) < CAPS_START) ||
+            (CAP_HANDLE_RAW(handle) > CAPS_LAST))
                 return NULL;
         ht_link_t *link = hash_table_find(&task->cap_info->caps, &handle);
@@ -329 +330 @@
 void cap_free(task_t *task, cap_handle_t handle)
 {
-        assert(handle >= CAPS_START);
-        assert(handle <= CAPS_LAST);
+        assert(CAP_HANDLE_RAW(handle) >= CAPS_START);
+        assert(CAP_HANDLE_RAW(handle) <= CAPS_LAST);
 
         mutex_lock(&task->cap_info->lock);
@@ -338 +339 @@
 
         hash_table_remove_item(&task->cap_info->caps, &cap->caps_link);
-        ra_free(task->cap_info->handles, handle, 1);
+        ra_free(task->cap_info->handles, CAP_HANDLE_RAW(handle), 1);
         slab_free(cap_cache, cap);
         mutex_unlock(&task->cap_info->lock);