Changeset e3c762cd in mainline for generic/src/ipc

Timestamp:

2006-05-05T11:59:19Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

de07bcf

Parents:

22cf454d

Message:

Complete implementation of copy_from_uspace() and copy_to_uspace()
for amd64 and ia32. Other architectures still compile and run,
but need to implement their own assembly-only memcpy(), memcpy_from_uspace(),
memcpy_to_uspace() and their failover parts. For these architectures
only dummy implementations are provided.

Location:

generic/src/ipc

Files:

• irq.c (modified) (3 diffs)
• sysipc.c (modified) (8 diffs)

generic/src/ipc/irq.c

@@ -48 +48 @@
 #include <ipc/irq.h>
 #include <atomic.h>
+#include <syscall/copy.h>
 
 typedef struct {
@@ -121 +122 @@
         irq_code_t *code;
         irq_cmd_t *ucmds;
+        int rc;
 
         code = malloc(sizeof(*code), 0);
-        copy_from_uspace(code, ucode, sizeof(*code));
+        rc = copy_from_uspace(code, ucode, sizeof(*code));
+        if (rc != 0) {
+                free(code);
+                return NULL;
+        }
         
         if (code->cmdcount > IRQ_MAX_PROG_SIZE) {
@@ -131 +137 @@
         ucmds = code->cmds;
         code->cmds = malloc(sizeof(code->cmds[0]) * (code->cmdcount), 0);
-        copy_from_uspace(code->cmds, ucmds, sizeof(code->cmds[0]) * (code->cmdcount));
+        rc = copy_from_uspace(code->cmds, ucmds, sizeof(code->cmds[0]) * (code->cmdcount));
+        if (rc != 0) {
+                free(code->cmds);
+                free(code);
+                return NULL;
+        }
 
         return code;

generic/src/ipc/sysipc.c

@@ -29 +29 @@
 #include <arch.h>
 #include <proc/task.h>
-
+#include <proc/thread.h>
 #include <errno.h>
-#include <mm/page.h>
 #include <memstr.h>
 #include <debug.h>
@@ -39 +38 @@
 #include <ipc/ipcrsc.h>
 #include <arch/interrupt.h>
-
 #include <print.h>
-#include <arch.h>
-#include <proc/thread.h>
+#include <syscall/copy.h>
 
 #define GET_CHECK_PHONE(phone,phoneid,err) { \
@@ -229 +226 @@
         phone_t *phone;
         int res;
+        int rc;
 
         ipc_call_static_init(&call);
-        copy_from_uspace(&call.data.args, &question->args, sizeof(call.data.args));
+        rc = copy_from_uspace(&call.data.args, &question->args, sizeof(call.data.args));
+        if (rc != 0)
+                return (__native) rc;
 
         GET_CHECK_PHONE(phone, phoneid, return ENOENT);
@@ -241 +241 @@
                 IPC_SET_RETVAL(call.data, res);
 
-        STRUCT_TO_USPACE(&reply->args, &call.data.args);
+        rc = STRUCT_TO_USPACE(&reply->args, &call.data.args);
+        if (rc != 0)
+                return rc;
 
         return 0;
@@ -298 +300 @@
         phone_t *phone;
         int res;
+        int rc;
 
         if (check_call_limit())
@@ -305 +308 @@
 
         call = ipc_call_alloc(0);
-        copy_from_uspace(&call->data.args, &data->args, sizeof(call->data.args));
+        rc = copy_from_uspace(&call->data.args, &data->args, sizeof(call->data.args));
+        if (rc != 0)
+                return (__native) rc;
         if (!(res=request_preprocess(call)))
                 ipc_call(phone, call);
@@ -394 +399 @@
         ipc_data_t saved_data;
         int saveddata = 0;
+        int rc;
 
         call = get_call(callid);
@@ -403 +409 @@
                 saveddata = 1;
         }
-        copy_from_uspace(&call->data.args, &data->args, 
+        rc = copy_from_uspace(&call->data.args, &data->args, 
                          sizeof(call->data.args));
+        if (rc != 0)
+                return rc;
 
         answer_preprocess(call, saveddata ? &saved_data : NULL);