Changeset 6caf5fb in mainline for kernel/generic/src/ipc/ipcrsc.c

Timestamp:

2025-01-16T21:42:15Z (21 hours ago)

Author:

GitHub <noreply@…>

Parents:

e0e2264 (diff), 455241b (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-01-16 21:42:15)

git-committer:

GitHub <noreply@…> (2025-01-16 21:42:15)

Message:

Merge 455241b37bedd3719ed3b5b025fdf26f44fd565b into e0e22648f5799cc98671695e153b0b00037daeb9

File:

• kernel/generic/src/ipc/ipcrsc.c (modified) (3 diffs)

kernel/generic/src/ipc/ipcrsc.c

@@ -44 +44 @@
 #include <stdlib.h>
 
-static void phone_destroy(void *arg)
+static void phone_destroy(kobject_t *arg)
 {
-        phone_t *phone = (phone_t *) arg;
+        phone_t *phone = phone_from_kobject(arg);
         if (phone->hangup_call)
-                kobject_put(phone->hangup_call->kobject);
+                kobject_put(&phone->hangup_call->kobject);
         slab_free(phone_cache, phone);
 }
@@ -76 +76 @@
                         return ENOMEM;
                 }
-                kobject_t *kobj = kobject_alloc(FRAME_ATOMIC);
-                if (!kobj) {
-                        cap_free(TASK, handle);
-                        slab_free(phone_cache, phone);
-                        return ENOMEM;
-                }
+
                 call_t *hcall = ipc_call_alloc();
                 if (!hcall) {
                         cap_free(TASK, handle);
                         slab_free(phone_cache, phone);
-                        free(kobj);
                         return ENOMEM;
                 }
@@ -94 +88 @@
                 phone->hangup_call = hcall;
 
-                kobject_initialize(kobj, KOBJECT_TYPE_PHONE, phone);
-                phone->kobject = kobj;
-
                 if (publish)
-                        cap_publish(task, handle, kobj);
+                        cap_publish(task, handle, &phone->kobject);
 
                 *phandle = handle;
                 if (kobject)
-                        *kobject = kobj;
+                        *kobject = &phone->kobject;
         }
         return rc;