Changes in kernel/generic/src/ipc/ipcrsc.c [455241b:fc0de8c] in mainline

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(kobject_t *arg)
+static void phone_destroy(void *arg)
 {
-        phone_t *phone = phone_from_kobject(arg);
+        phone_t *phone = (phone_t *) 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;
                 }
@@ -88 +94 @@
                 phone->hangup_call = hcall;
 
+                kobject_initialize(kobj, KOBJECT_TYPE_PHONE, phone);
+                phone->kobject = kobj;
+
                 if (publish)
-                        cap_publish(task, handle, &phone->kobject);
+                        cap_publish(task, handle, kobj);
 
                 *phandle = handle;
                 if (kobject)
-                        *kobject = &phone->kobject;
+                        *kobject = kobj;
         }
         return rc;