Changes in kernel/generic/src/ipc/sysipc.c [f6bffee:228e490] in mainline

File:

• kernel/generic/src/ipc/sysipc.c (modified) (5 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -248 +248 @@
                         /* The connection was accepted */
                         phone_connect(phoneid, &answer->sender->answerbox);
-                        /* Set 'task hash' as arg4 of response */
-                        IPC_SET_ARG4(answer->data, (sysarg_t) TASK);
                         /* Set 'phone hash' as arg5 of response */
                         IPC_SET_ARG5(answer->data,
@@ -426 +424 @@
         case IPC_M_DATA_READ: {
                 size_t size = IPC_GET_ARG2(call->data);
-                if (size <= 0)
+                if ((size <= 0 || (size > DATA_XFER_LIMIT)))
                         return ELIMIT;
-                if (size > DATA_XFER_LIMIT) {
-                        int flags = IPC_GET_ARG3(call->data);
-                        if (flags & IPC_XF_RESTRICT)
-                                IPC_SET_ARG2(call->data, DATA_XFER_LIMIT);
-                        else
-                                return ELIMIT;
-                }
+                
                 break;
         }
@@ -441 +433 @@
                 size_t size = IPC_GET_ARG2(call->data);
                 
-                if (size > DATA_XFER_LIMIT) {
-                        int flags = IPC_GET_ARG3(call->data);
-                        if (flags & IPC_XF_RESTRICT) {
-                                size = DATA_XFER_LIMIT;
-                                IPC_SET_ARG2(call->data, size);
-                        } else
-                                return ELIMIT;
-                }
+                if (size > DATA_XFER_LIMIT)
+                        return ELIMIT;
                 
                 call->buffer = (uint8_t *) malloc(size, 0);
@@ -1117 +1103 @@
  *
  */
-sysarg_t sys_register_irq(inr_t inr, devno_t devno, sysarg_t imethod,
+sysarg_t sys_ipc_register_irq(inr_t inr, devno_t devno, sysarg_t imethod,
     irq_code_t *ucode)
 {
@@ -1134 +1120 @@
  *
  */
-sysarg_t sys_unregister_irq(inr_t inr, devno_t devno)
+sysarg_t sys_ipc_unregister_irq(inr_t inr, devno_t devno)
 {
         if (!(cap_get(TASK) & CAP_IRQ_REG))