Changes in kernel/generic/src/cap/cap.c [c1f68b0:ce732e74] in mainline

File:

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

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)
@@ -148 +150 @@
 void caps_task_init(task_t *task)
 {
-        mutex_initialize(&task->cap_info->lock, MUTEX_RECURSIVE);
+        mutex_initialize(&task->cap_info->lock, MUTEX_PASSIVE);
 
         for (kobject_type_t t = 0; t < KOBJECT_TYPE_MAX; t++)
@@ -238 +240 @@
         if (cap->state == CAP_STATE_PUBLISHED && cap->kobject->ops->reclaim &&
             cap->kobject->ops->reclaim(cap->kobject)) {
-                kobject_t *kobj = cap_unpublish(cap->task, cap->handle,
+                kobject_t *kobj = cap_unpublish_locked(cap->task, cap->handle,
                     cap->kobject->type);
                 kobject_put(kobj);
@@ -318 +320 @@
 }
 
-/** Unpublish published capability
- *
- * The kernel object is moved out of the capability. In other words, the
- * capability's reference to the objects is handed over to the kernel object
- * pointer returned by this function. Once unpublished, the capability does not
- * refer to any kernel object anymore.
- *
- * @param task    Task in which to unpublish the capability.
- * @param handle  Capability handle.
- * @param type    Kernel object type of the object associated with the
- *                capability.
- */
-kobject_t *cap_unpublish(task_t *task, cap_handle_t handle, kobject_type_t type)
+static kobject_t *
+cap_unpublish_locked(task_t *task, cap_handle_t handle, kobject_type_t type)
 {
         kobject_t *kobj = NULL;
 
-        mutex_lock(&task->cap_info->lock);
         cap_t *cap = cap_get(task, handle, CAP_STATE_PUBLISHED);
         if (cap) {
@@ -345 +335 @@
                 }
         }
+
+        return kobj;
+}
+
+/** Unpublish published capability
+ *
+ * The kernel object is moved out of the capability. In other words, the
+ * capability's reference to the objects is handed over to the kernel object
+ * pointer returned by this function. Once unpublished, the capability does not
+ * refer to any kernel object anymore.
+ *
+ * @param task    Task in which to unpublish the capability.
+ * @param handle  Capability handle.
+ * @param type    Kernel object type of the object associated with the
+ *                capability.
+ */
+kobject_t *cap_unpublish(task_t *task, cap_handle_t handle, kobject_type_t type)
+{
+
+        mutex_lock(&task->cap_info->lock);
+        kobject_t *kobj = cap_unpublish_locked(task, handle, type);
         mutex_unlock(&task->cap_info->lock);