From 5e4aca2f5f06f0d16fc140f64b6f09865749350d Mon Sep 17 00:00:00 2001 From: pirofti <> Date: Tue, 20 Oct 2009 21:19:37 +0000 Subject: [PATCH] Check mmap return value against MAP_FAILED not NULL. Okay deraadt@, otto@. --- src/lib/libc/stdlib/malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index a94e362c..9e58d2d9 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.116 2009/06/08 19:21:08 deraadt Exp $ */ +/* $OpenBSD: malloc.c,v 1.117 2009/10/20 21:19:37 pirofti Exp $ */ /* * Copyright (c) 2008 Otto Moerbeek * @@ -696,7 +696,7 @@ omalloc_init(struct dir_info **dp) * randomise offset inside the page at which the dir_info * lies (subject to alignment by 1 << MALLOC_MINSHIFT) */ - if ((p = MMAP(DIR_INFO_RSZ + (MALLOC_PAGESIZE * 2))) == NULL) + if ((p = MMAP(DIR_INFO_RSZ + (MALLOC_PAGESIZE * 2))) == MAP_FAILED) return -1; mprotect(p, MALLOC_PAGESIZE, PROT_NONE); mprotect(p + MALLOC_PAGESIZE + DIR_INFO_RSZ,