munmap: check vaddr and size alignment

JIRA: RTOS-967
phoenix-rtos · Nov 5, 2024 · 91c9cad · 91c9cad
1 parent 464ea21
commit 91c9cad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/syscalls.c b/syscalls.c
@@ -123,6 +123,7 @@ int syscalls_sys_munmap(void *ustack)
 	GETFROMSTACK(ustack, void *, vaddr, 0);
 	GETFROMSTACK(ustack, size_t, size, 1);
 
+	size = round_page(size);
 	err = vm_munmap(proc->mapp, vaddr, size);
 	if (err < 0) {
 		return err;

diff --git a/vm/map.c b/vm/map.c
@@ -412,6 +412,10 @@ int _vm_munmap(vm_map_t *map, void *vaddr, size_t size)
 	ptr_t eAoffs;
 	int putEntry;
 
+	if (((size & (SIZE_PAGE - 1)) != 0) || (((ptr_t)vaddr & (SIZE_PAGE - 1)) != 0)) {
+		return -EINVAL;
+	}
+
 	t.vaddr = vaddr;
 	t.size = size;