Changeset d088616 in mainline

Timestamp:

2017-10-28T08:49:42Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d470ec8

Parents:

9b642f92

Message:

Provide locked versions of cap_unpublish() and cap_free()

This is necessary so that capabilities can be unpublished and freed from a
caps_apply_to_kobject_type() callback.

Location:

kernel/generic

Files:

• include/cap/cap.h (modified) (1 diff)
• src/cap/cap.c (modified) (4 diffs)

kernel/generic/include/cap/cap.h

@@ -121 +121 @@
 extern void cap_publish(struct task *, cap_handle_t, kobject_t *);
 extern kobject_t *cap_unpublish(struct task *, cap_handle_t, kobject_type_t);
+extern kobject_t *cap_unpublish_locked(struct task *, cap_handle_t,
+    kobject_type_t);
 extern void cap_free(struct task *, cap_handle_t);
+extern void cap_free_locked(struct task *, cap_handle_t);
 
 extern void kobject_initialize(kobject_t *, kobject_type_t, void *,

kernel/generic/src/cap/cap.c

@@ -84 +84 @@
 
 static slab_cache_t *cap_slab;
-
-static kobject_t *cap_unpublish_locked(task_t *, cap_handle_t, kobject_type_t);
 
 static size_t caps_hash(const ht_link_t *item)
@@ -320 +318 @@
 }
 
-static kobject_t *
+/** @copydoc cap_unpublish()
+ *
+ * Can only be called internally by the capability subsytem or from a
+ * caps_apply_to_kobject_type() callback.
+ */
+kobject_t *
 cap_unpublish_locked(task_t *task, cap_handle_t handle, kobject_type_t type)
 {
@@ -361 +364 @@
 }
 
-/** Free allocated capability
- *
- * @param task    Task in which to free the capability.
- * @param handle  Capability handle.
- */
-void cap_free(task_t *task, cap_handle_t handle)
+/** @copydoc cap_free()
+ *
+ * Can only be called internally by the capability subsytem or from a
+ * caps_apply_to_kobject_type() callback.
+ */
+void cap_free_locked(task_t *task, cap_handle_t handle)
 {
         assert(handle >= 0);
         assert(handle < MAX_CAPS);
 
-        mutex_lock(&task->cap_info->lock);
         cap_t *cap = cap_get(task, handle, CAP_STATE_ALLOCATED);
 
@@ -379 +381 @@
         ra_free(task->cap_info->handles, handle, 1);
         slab_free(cap_slab, cap);
+}
+
+/** Free allocated capability
+ *
+ * @param task    Task in which to free the capability.
+ * @param handle  Capability handle.
+ */
+void cap_free(task_t *task, cap_handle_t handle)
+{
+        mutex_lock(&task->cap_info->lock);
+        cap_free_locked(task, handle);
         mutex_unlock(&task->cap_info->lock);
 }