diff options
| author | pirofti <> | 2009-10-20 21:19:37 +0000 |
|---|---|---|
| committer | pirofti <> | 2009-10-20 21:19:37 +0000 |
| commit | a21621729c2c275e38dc485cc15b6b0fadac6f8a (patch) | |
| tree | 7fd6a4d9218a1543528d2995cbedd4c113999fd9 /src/lib/libc/stdlib/malloc.c | |
| parent | c60cc3534a1017f18ae4f304bae4d32410563a2b (diff) | |
| download | openbsd-a21621729c2c275e38dc485cc15b6b0fadac6f8a.tar.gz openbsd-a21621729c2c275e38dc485cc15b6b0fadac6f8a.tar.bz2 openbsd-a21621729c2c275e38dc485cc15b6b0fadac6f8a.zip | |
Check mmap return value against MAP_FAILED not NULL.
Okay deraadt@, otto@.
Diffstat (limited to 'src/lib/libc/stdlib/malloc.c')
| -rw-r--r-- | src/lib/libc/stdlib/malloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index a94e362ceb..9e58d2d964 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: malloc.c,v 1.116 2009/06/08 19:21:08 deraadt Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.117 2009/10/20 21:19:37 pirofti Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> | 3 | * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> |
| 4 | * | 4 | * |
| @@ -696,7 +696,7 @@ omalloc_init(struct dir_info **dp) | |||
| 696 | * randomise offset inside the page at which the dir_info | 696 | * randomise offset inside the page at which the dir_info |
| 697 | * lies (subject to alignment by 1 << MALLOC_MINSHIFT) | 697 | * lies (subject to alignment by 1 << MALLOC_MINSHIFT) |
| 698 | */ | 698 | */ |
| 699 | if ((p = MMAP(DIR_INFO_RSZ + (MALLOC_PAGESIZE * 2))) == NULL) | 699 | if ((p = MMAP(DIR_INFO_RSZ + (MALLOC_PAGESIZE * 2))) == MAP_FAILED) |
| 700 | return -1; | 700 | return -1; |
| 701 | mprotect(p, MALLOC_PAGESIZE, PROT_NONE); | 701 | mprotect(p, MALLOC_PAGESIZE, PROT_NONE); |
| 702 | mprotect(p + MALLOC_PAGESIZE + DIR_INFO_RSZ, | 702 | mprotect(p + MALLOC_PAGESIZE + DIR_INFO_RSZ, |