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

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

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

kernel/generic/src/mm/as.c

@@ -2092 +2092 @@
 
 sysarg_t sys_as_area_create(uintptr_t base, size_t size, unsigned int flags,
-    uintptr_t bound, as_area_pager_info_t *pager_info)
+    uintptr_t bound, uspace_ptr_as_area_pager_info_t pager_info)
 {
         uintptr_t virt = base;
@@ -2098 +2098 @@
         mem_backend_data_t backend_data;
 
-        if (pager_info == AS_AREA_UNPAGED)
+        if (!pager_info)
                 backend = &anon_backend;
         else {
@@ -2125 +2125 @@
 }
 
-sys_errno_t sys_as_area_get_info(uintptr_t address, as_area_info_t *dest)
+sys_errno_t sys_as_area_get_info(uintptr_t address, uspace_ptr_as_area_info_t dest)
 {
         as_area_t *area;
+        as_area_info_t info;
+
+        /* Prevent leaking stack bytes via structure padding. */
+        memset(&info, 0, sizeof(info));
 
         mutex_lock(&AS->lock);
@@ -2136 +2140 @@
         }
 
-        dest->start_addr = area->base;
-        dest->size = P2SZ(area->pages);
-        dest->flags = area->flags;
+        info.start_addr = area->base;
+        info.size = P2SZ(area->pages);
+        info.flags = area->flags;
 
         mutex_unlock(&area->lock);
         mutex_unlock(&AS->lock);
+
+        copy_to_uspace(dest, &info, sizeof(info));
         return EOK;
 }