Changeset b389f95 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2018-11-09T22:03:24Z (7 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

File:

• kernel/generic/src/mm/as.c (modified) (3 diffs)

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;
 }