Changeset b389f95 in mainline

Timestamp:

2018-11-09T22:03:24Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

4f3aa76

Parents:

deacd722

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-08 02:55:57)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-09 22:03:24)

Message:

Allow as_get_area_info() to fail

Location:

kernel/generic

Files:

• include/mm/as.h (modified) (1 diff)
• src/mm/as.c (modified) (3 diffs)
• src/udebug/udebug_ipc.c (modified) (3 diffs)

kernel/generic/include/mm/as.h

@@ -325 +325 @@
 
 /* Introspection functions. */
-extern void as_get_area_info(as_t *, as_area_info_t **, size_t *);
+extern as_area_info_t *as_get_area_info(as_t *, size_t *);
 extern void as_print(as_t *);
 

kernel/generic/src/mm/as.c

@@ -2237 +2237 @@
  *
  */
-void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize)
+as_area_info_t *as_get_area_info(as_t *as, size_t *osize)
 {
         mutex_lock(&as->lock);
@@ -2245 +2245 @@
 
         size_t isize = area_cnt * sizeof(as_area_info_t);
-        as_area_info_t *info = nfmalloc(isize);
+        as_area_info_t *info = malloc(isize);
+        if (!info) {
+                mutex_unlock(&as->lock);
+                return NULL;
+        }
 
         /* Record area data. */
@@ -2267 +2271 @@
         mutex_unlock(&as->lock);
 
-        *obuf = info;
         *osize = isize;
+        return info;
 }
 

kernel/generic/src/udebug/udebug_ipc.c

@@ -266 +266 @@
         size_t data_size;
         size_t buf_size;
-        void *data;
+        as_area_info_t *data;
 
         uspace_addr = IPC_GET_ARG2(call->data); /* Destination address */
@@ -274 +274 @@
          * Read area list.
          */
-        as_get_area_info(AS, (as_area_info_t **) &data, &data_size);
+        data = as_get_area_info(AS, &data_size);
+        if (!data) {
+                IPC_SET_RETVAL(call->data, ENOMEM);
+                ipc_answer(&TASK->kb.box, call);
+                return;
+        }
 
         /* Copy MAX(buf_size, data_size) bytes */
@@ -297 +302 @@
 
         IPC_SET_ARG3(call->data, data_size);
-        call->buffer = data;
+        call->buffer = (uint8_t *) data;
 
         ipc_answer(&TASK->kb.box, call);