proxmox-mirrors/wasi-libc
1
0
Fork 0
mirror of https://git.proxmox.com/git/wasi-libc synced 2025-07-27 11:20:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix mmap overflow and some other stuff

Browse Source
This commit is contained in:
vms 2019-05-04 20:37:27 +03:00 committed by Dan Gohman
parent 8e8cc34aad
commit 20c48b57c7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libc-bottom-half/mman/mman.c
View File

@ -58,6 +58,12 @@ void *mmap(void *addr, size_t length, int prot, int flags,
return MAP_FAILED; return MAP_FAILED;
} }
// Check for overflow
if(sizeof(struct map) + length < sizeof(struct map)) {
errno = EINVAL;
return MAP_FAILED;
}
// Allocate the memory. // Allocate the memory.
struct map *map = malloc(sizeof(struct map) + length); struct map *map = malloc(sizeof(struct map) + length);
if (!map) { if (!map) {
@ -76,7 +82,7 @@ void *mmap(void *addr, size_t length, int prot, int flags,
if ((flags & MAP_ANON) == 0) { if ((flags & MAP_ANON) == 0) {
char *body = map->body; char *body = map->body;
while (length > 0) { while (length > 0) {
ssize_t nread = pread(fd, body, length, offset); const ssize_t nread = pread(fd, body, length, offset);
if (nread < 0) { if (nread < 0) {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
@ -97,9 +103,6 @@ void *mmap(void *addr, size_t length, int prot, int flags,
int munmap(void *addr, size_t length) { int munmap(void *addr, size_t length) {
struct map *map = (struct map *)addr - 1; struct map *map = (struct map *)addr - 1;
off_t offset = map->offset;
int flags = map->flags;
int prot = map->prot;
// We don't support partial munmapping. // We don't support partial munmapping.
if (map->length != length) { if (map->length != length) {