From 4594ab4487e73070cff05c330cce9ed796246510 Mon Sep 17 00:00:00 2001
From: otto <>
Date: Mon, 23 Nov 2020 15:42:11 +0000
Subject: mapalign() only handles allocations >= a page; problem found by and
 ok semarie@

---
 src/lib/libc/stdlib/malloc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 86670fca87..7004a0aa36 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malloc.c,v 1.266 2020/10/12 22:08:33 deraadt Exp $	*/
+/*	$OpenBSD: malloc.c,v 1.267 2020/11/23 15:42:11 otto Exp $	*/
 /*
  * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
  * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -1957,6 +1957,8 @@ omemalign(struct dir_info *pool, size_t alignment, size_t sz, int zero_fill,
 		return NULL;
 	}
 
+	if (sz < MALLOC_PAGESIZE)
+		sz = MALLOC_PAGESIZE;
 	sz += mopts.malloc_guard;
 	psz = PAGEROUND(sz);
 
-- 
cgit v1.2.3-55-g6feb