diff options
| author | otto <> | 2017-04-18 15:46:44 +0000 |
|---|---|---|
| committer | otto <> | 2017-04-18 15:46:44 +0000 |
| commit | 250858df6d6714cfd6461784ac04f1205060fb3f (patch) | |
| tree | bf4a734a609dc2c647f97f49e29ef11b32279cfa /src/lib/libc | |
| parent | d1b012a5aa610c2a77715ea628538867362a322a (diff) | |
| download | openbsd-250858df6d6714cfd6461784ac04f1205060fb3f.tar.gz openbsd-250858df6d6714cfd6461784ac04f1205060fb3f.tar.bz2 openbsd-250858df6d6714cfd6461784ac04f1205060fb3f.zip | |
don't forget to fill in canary bytes for posix_memalign(3); reported by
and ok jeremy@
Diffstat (limited to 'src/lib/libc')
| -rw-r--r-- | src/lib/libc/stdlib/malloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 5b92b56eb4..4e5176f71e 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.222 2017/04/17 16:36:35 otto Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.223 2017/04/18 15:46:44 otto Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> | 3 | * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> |
| 4 | * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> | 4 | * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> |
| @@ -2018,6 +2018,9 @@ omemalign(struct dir_info *pool, size_t alignment, size_t sz, int zero_fill, voi | |||
| 2018 | else | 2018 | else |
| 2019 | memset(p, SOME_JUNK, psz - mopts.malloc_guard); | 2019 | memset(p, SOME_JUNK, psz - mopts.malloc_guard); |
| 2020 | } | 2020 | } |
| 2021 | else if (mopts.chunk_canaries) | ||
| 2022 | fill_canary(p, sz - mopts.malloc_guard, | ||
| 2023 | psz - mopts.malloc_guard); | ||
| 2021 | 2024 | ||
| 2022 | return p; | 2025 | return p; |
| 2023 | } | 2026 | } |