From d594621d1e17808877ec4349feef66230a5830e0 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 18 Apr 2017 15:46:45 +0000 Subject: don't forget to fill in canary bytes for posix_memalign(3); reported by and ok jeremy@ --- lib/libc/stdlib/malloc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 5b92b56eb48..4e5176f71ee 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.222 2017/04/17 16:36:35 otto Exp $ */ +/* $OpenBSD: malloc.c,v 1.223 2017/04/18 15:46:44 otto Exp $ */ /* * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek * Copyright (c) 2012 Matthew Dempsky @@ -2018,6 +2018,9 @@ omemalign(struct dir_info *pool, size_t alignment, size_t sz, int zero_fill, voi else memset(p, SOME_JUNK, psz - mopts.malloc_guard); } + else if (mopts.chunk_canaries) + fill_canary(p, sz - mopts.malloc_guard, + psz - mopts.malloc_guard); return p; } -- cgit v1.2.3