diff options
| -rw-r--r-- | lib/libc/dlfcn/dlfcn_stubs.c | 3 | ||||
| -rw-r--r-- | lib/libc/hidden/dlfcn.h | 4 | ||||
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 13 |
3 files changed, 13 insertions, 7 deletions
diff --git a/lib/libc/dlfcn/dlfcn_stubs.c b/lib/libc/dlfcn/dlfcn_stubs.c index 78d728f66cb..6359d1815a8 100644 --- a/lib/libc/dlfcn/dlfcn_stubs.c +++ b/lib/libc/dlfcn/dlfcn_stubs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dlfcn_stubs.c,v 1.15 2019/06/02 01:03:01 guenther Exp $ */ +/* $OpenBSD: dlfcn_stubs.c,v 1.16 2020/10/09 16:01:48 otto Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -103,6 +103,7 @@ dladdr(const void *addr, struct dl_info *info) printf("Wrong dl symbols!\n"); return -1; } +DEF_WEAK(dladdr); #if 0 /* Thread Local Storage argument structure */ diff --git a/lib/libc/hidden/dlfcn.h b/lib/libc/hidden/dlfcn.h index bb6dc23c266..e9c23a96438 100644 --- a/lib/libc/hidden/dlfcn.h +++ b/lib/libc/hidden/dlfcn.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dlfcn.h,v 1.1 2019/06/02 01:03:01 guenther Exp $ */ +/* $OpenBSD: dlfcn.h,v 1.2 2020/10/09 16:01:48 otto Exp $ */ /* * Copyright (c) 2019 Philip Guenther <guenther@openbsd.org> * @@ -20,7 +20,7 @@ #include_next <dlfcn.h> -PROTO_DEPRECATED(dladdr); +PROTO_NORMAL(dladdr); PROTO_DEPRECATED(dlclose); PROTO_DEPRECATED(dlerror); PROTO_DEPRECATED(dlopen); diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index e979428b233..a62bfac3e5e 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.264 2020/10/06 06:31:14 otto Exp $ */ +/* $OpenBSD: malloc.c,v 1.265 2020/10/09 16:01:48 otto Exp $ */ /* * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> @@ -193,7 +193,7 @@ struct malloc_readonly { int def_malloc_junk; /* junk fill? */ int malloc_realloc; /* always realloc? */ int malloc_xmalloc; /* xmalloc behaviour? */ - int chunk_canaries; /* use canaries after chunks? */ + u_int chunk_canaries; /* use canaries after chunks? */ int internal_funcs; /* use better recallocarray/freezero? */ u_int def_malloc_cache; /* free pages we cache */ size_t malloc_guard; /* use guard pages after allocations? */ @@ -468,6 +468,11 @@ omalloc_init(void) while ((mopts.malloc_canary = arc4random()) == 0) ; + if (mopts.chunk_canaries) + do { + mopts.chunk_canaries = arc4random(); + } while ((u_char)mopts.chunk_canaries == 0 || + (u_char)mopts.chunk_canaries == SOME_FREEJUNK); } static void @@ -918,7 +923,7 @@ fill_canary(char *ptr, size_t sz, size_t allocated) if (check_sz > CHUNK_CHECK_LENGTH) check_sz = CHUNK_CHECK_LENGTH; - memset(ptr + sz, SOME_JUNK, check_sz); + memset(ptr + sz, mopts.chunk_canaries, check_sz); } /* @@ -1019,7 +1024,7 @@ validate_canary(struct dir_info *d, u_char *ptr, size_t sz, size_t allocated) q = p + check_sz; while (p < q) { - if (*p != SOME_JUNK) { + if (*p != (u_char)mopts.chunk_canaries && *p != SOME_JUNK) { wrterror(d, "chunk canary corrupted %p %#tx@%#zx%s", ptr, p - ptr, sz, *p == SOME_FREEJUNK ? " (double free?)" : ""); |