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

Timestamp:

2018-05-11T20:22:42Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d2c5159

Parents:

ae89656

Message:

Use atomic malloc allocations

We can safely use atomic allocations in places that use the non-failing
version of malloc(), but test the return value anyway. And also in some
places that can afford to return failure but did not because of comfort.

Location:

kernel/generic/src/ipc

Files:

• irq.c (modified) (4 diffs)
• ops/dataread.c (modified) (2 diffs)
• ops/datawrite.c (modified) (1 diff)

kernel/generic/src/ipc/irq.c

@@ -82 +82 @@
 {
         /* Copy the physical base addresses aside. */
-        uintptr_t *pbase = malloc(rangecount * sizeof(uintptr_t), 0);
+        uintptr_t *pbase = malloc(rangecount * sizeof(uintptr_t), FRAME_ATOMIC);
+        if (!pbase)
+                return ENOMEM;
         for (size_t i = 0; i < rangecount; i++)
                 pbase[i] = ranges[i].base;
@@ -225 +227 @@
         irq_cmd_t *cmds = NULL;
 
-        irq_code_t *code = malloc(sizeof(*code), 0);
+        irq_code_t *code = malloc(sizeof(*code), FRAME_ATOMIC);
+        if (!code)
+                return NULL;
         errno_t rc = copy_from_uspace(code, ucode, sizeof(*code));
         if (rc != EOK)
@@ -234 +238 @@
                 goto error;
 
-        ranges = malloc(sizeof(code->ranges[0]) * code->rangecount, 0);
+        ranges = malloc(sizeof(code->ranges[0]) * code->rangecount,
+            FRAME_ATOMIC);
+        if (!ranges)
+                goto error;
         rc = copy_from_uspace(ranges, code->ranges,
             sizeof(code->ranges[0]) * code->rangecount);
@@ -240 +247 @@
                 goto error;
 
-        cmds = malloc(sizeof(code->cmds[0]) * code->cmdcount, 0);
+        cmds = malloc(sizeof(code->cmds[0]) * code->cmdcount, FRAME_ATOMIC);
+        if (!cmds)
+                goto error;
         rc = copy_from_uspace(cmds, code->cmds,
             sizeof(code->cmds[0]) * code->cmdcount);

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

@@ -75 +75 @@
                         IPC_SET_ARG1(answer->data, dst);
 
-                        answer->buffer = malloc(size, 0);
+                        answer->buffer = malloc(size, FRAME_ATOMIC);
+                        if (!answer->buffer) {
+                                IPC_SET_RETVAL(answer->data, ENOMEM);
+                                return EOK;
+                        }
                         errno_t rc = copy_from_uspace(answer->buffer,
                             (void *) src, size);
@@ -84 +88 @@
                                  * ipc_call_free().
                                  */
+                                return EOK;
                         }
                 } else if (!size) {

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

@@ -56 +56 @@
         }
 
-        call->buffer = (uint8_t *) malloc(size, 0);
+        call->buffer = (uint8_t *) malloc(size, FRAME_ATOMIC);
+        if (!call->buffer)
+                return ENOMEM;
         errno_t rc = copy_from_uspace(call->buffer, (void *) src, size);
         if (rc != EOK) {