Changeset d57c7c2 in mainline for uspace/lib/c/generic/async/server.c

Timestamp:

2018-11-04T14:34:08Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9c26ef0

Parents:

9c1841b

Message:

Make sure not to answer async calls twice

This commit explicitly invalidates the remembered capability handle
so that the async framework can detect when a call is answered twice.

File:

• uspace/lib/c/generic/async/server.c (modified) (10 diffs)

uspace/lib/c/generic/async/server.c

@@ -1025 +1025 @@
 errno_t async_accept_0(ipc_call_t *call)
 {
-        return ipc_answer_5(call->cap_handle, EOK, 0, 0, 0, 0,
-            async_get_label());
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+        return ipc_answer_5(chandle, EOK, 0, 0, 0, 0, async_get_label());
 }
 
 errno_t async_answer_0(ipc_call_t *call, errno_t retval)
 {
-        return ipc_answer_0(call->cap_handle, retval);
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+        return ipc_answer_0(chandle, retval);
 }
 
 errno_t async_answer_1(ipc_call_t *call, errno_t retval, sysarg_t arg1)
 {
-        return ipc_answer_1(call->cap_handle, retval, arg1);
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+        return ipc_answer_1(chandle, retval, arg1);
 }
 
@@ -1042 +1050 @@
     sysarg_t arg2)
 {
-        return ipc_answer_2(call->cap_handle, retval, arg1, arg2);
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+        return ipc_answer_2(chandle, retval, arg1, arg2);
 }
 
@@ -1048 +1059 @@
     sysarg_t arg2, sysarg_t arg3)
 {
-        return ipc_answer_3(call->cap_handle, retval, arg1, arg2, arg3);
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+        return ipc_answer_3(chandle, retval, arg1, arg2, arg3);
 }
 
@@ -1054 +1068 @@
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
-        return ipc_answer_4(call->cap_handle, retval, arg1, arg2, arg3, arg4);
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+        return ipc_answer_4(chandle, retval, arg1, arg2, arg3, arg4);
 }
 
@@ -1060 +1077 @@
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5)
 {
-        return ipc_answer_5(call->cap_handle, retval, arg1, arg2, arg3, arg4,
-            arg5);
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+        return ipc_answer_5(chandle, retval, arg1, arg2, arg3, arg4, arg5);
 }
 
@@ -1069 +1088 @@
         assert(call);
 
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+
         if (exch == NULL)
                 return ENOENT;
 
-        return ipc_forward_fast(call->cap_handle, exch->phone, imethod, arg1,
-            arg2, mode);
+        return ipc_forward_fast(chandle, exch->phone, imethod, arg1, arg2,
+            mode);
 }
 
@@ -1082 +1105 @@
         assert(call);
 
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+
         if (exch == NULL)
                 return ENOENT;
 
-        return ipc_forward_slow(call->cap_handle, exch->phone, imethod, arg1,
-            arg2, arg3, arg4, arg5, mode);
+        return ipc_forward_slow(chandle, exch->phone, imethod, arg1, arg2, arg3,
+            arg4, arg5, mode);
 }
 
@@ -1159 +1186 @@
         assert(call);
 
-        return ipc_answer_2(call->cap_handle, EOK, (sysarg_t) src, (sysarg_t) flags);
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+
+        return ipc_answer_2(chandle, EOK, (sysarg_t) src, (sysarg_t) flags);
 }
 
@@ -1211 +1242 @@
         assert(call);
 
-        return ipc_answer_2(call->cap_handle, EOK, (sysarg_t) __progsymbols.end,
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+
+        return ipc_answer_2(chandle, EOK, (sysarg_t) __progsymbols.end,
             (sysarg_t) dst);
 }
@@ -1262 +1297 @@
         assert(call);
 
-        return ipc_answer_2(call->cap_handle, EOK, (sysarg_t) src,
-            (sysarg_t) size);
+        cap_call_handle_t chandle = call->cap_handle;
+        assert(chandle != CAP_NIL);
+        call->cap_handle = CAP_NIL;
+
+        return ipc_answer_2(chandle, EOK, (sysarg_t) src, (sysarg_t) size);
 }