Changeset cf3aee19 in mainline for kernel/generic/src/ipc

Timestamp:

2015-06-17T23:45:24Z (11 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

523b17a

Parents:

fc7bf19 (diff), 2654afb (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.

Message:

Sync with mainline

Location:

kernel/generic/src/ipc

Files:

• ops/conctmeto.c (modified) (3 diffs)
• sysipc.c (modified) (2 diffs)

kernel/generic/src/ipc/ops/conctmeto.c

@@ -44 +44 @@
         int newphid = phone_alloc(TASK);
 
+        /* Remember the phoneid or the error. */
+        call->priv = newphid;
         if (newphid < 0)
                 return ELIMIT;
@@ -49 +51 @@
         /* Set arg5 for server */
         IPC_SET_ARG5(call->data, (sysarg_t) &TASK->phones[newphid]);
-        call->priv = newphid;
 
         return EOK;
@@ -73 +74 @@
 static int answer_process(call_t *answer)
 {
-        if (IPC_GET_RETVAL(answer->data))
-                phone_dealloc(answer->priv);
-        else
-                IPC_SET_ARG5(answer->data, answer->priv);
+        int newphid = (int) answer->priv;
+
+        if (IPC_GET_RETVAL(answer->data)) {
+                if (newphid >= 0) {
+                        /*
+                         * The phone was indeed allocated and now needs
+                         * to be deallocated.
+                         */
+                        phone_dealloc(newphid);
+                }
+        } else {
+                IPC_SET_ARG5(answer->data, newphid);
+        }
         
         return EOK;

kernel/generic/src/ipc/sysipc.c

@@ -388 +388 @@
 {
         call_t *call = get_call(callid);
-        phone_t *phone;
-        bool need_old = answer_need_old(call);
-        bool after_forward = false;
-        ipc_data_t old;
-        int rc;
-
         if (!call)
                 return ENOENT;
-
+        
+        ipc_data_t old;
+        bool need_old = answer_need_old(call);
         if (need_old)
                 old = call->data;
+        
+        bool after_forward = false;
+        int rc;
+        phone_t *phone;
         
         if (phone_get(phoneid, &phone) != EOK) {
@@ -409 +409 @@
                 goto error;
         }
-
+        
         call->flags |= IPC_CALL_FORWARDED;