mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

fix: dev: Stop using malloc_usable_size and malloc_size

Browse Source 
The `malloc_usable_size()` can return size larger than originally allocated and when these sizes disagree the fortifier enabled by `_FORTIFY_SOURCE=3` detects overflow and stops the `named` execution abruptly.  Stop using these convenience functions as they are primary used for introspection-only.

Closes #4880

Merge branch '4880-dont-use-malloc_usable_size' into 'main'

Closes #4880

See merge request isc-projects/bind9!9400
This commit is contained in:
Ondřej Surý
2024-08-26 15:01:03 +00:00
parent b37c15d244 d61712d14e
commit f99da39934
2 changed files with 3 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -1267,8 +1267,7 @@ AS_CASE([$with_jemalloc],
AS_IF([test "$with_jemalloc" = "no"], AS_IF([test "$with_jemalloc" = "no"],
[AS_CASE([$host], [AS_CASE([$host],
[*-freebsd*],[AC_MSG_ERROR([You cannot compile without jemalloc; jemalloc is the system allocator on FreeBSD])]) [*-freebsd*],[AC_MSG_ERROR([You cannot compile without jemalloc; jemalloc is the system allocator on FreeBSD])])])
AC_CHECK_FUNCS([malloc_size malloc_usable_size])])
AM_CONDITIONAL([HAVE_JEMALLOC], [test "$with_jemalloc" = "yes"]) AM_CONDITIONAL([HAVE_JEMALLOC], [test "$with_jemalloc" = "yes"])

94
lib/isc/jemalloc_shim.h
View File

@@ -26,89 +26,6 @@ const char *malloc_conf = NULL;
#define MALLOCX_TCACHE_NONE (0) #define MALLOCX_TCACHE_NONE (0)
#define MALLOCX_ARENA(a) (0) #define MALLOCX_ARENA(a) (0)
#if defined(HAVE_MALLOC_SIZE) || defined(HAVE_MALLOC_USABLE_SIZE)
#include <stdlib.h>
#ifdef HAVE_MALLOC_SIZE
#include <malloc/malloc.h>
static inline size_t
sallocx(void *ptr, int flags) {
UNUSED(flags);
return (malloc_size(ptr));
}
#elif HAVE_MALLOC_USABLE_SIZE
#ifdef __DragonFly__
/*
* On DragonFly BSD 'man 3 malloc' advises us to include the following
* header to have access to malloc_usable_size().
*/
#include <malloc_np.h>
#else
#include <malloc.h>
#endif
static inline size_t
sallocx(void *ptr, int flags) {
UNUSED(flags);
return (malloc_usable_size(ptr));
}
#endif /* HAVE_MALLOC_SIZE */
static inline void *
mallocx(size_t size, int flags) {
void *ptr = malloc(size);
INSIST(ptr != NULL);
if ((flags & MALLOCX_ZERO) != 0) {
memset(ptr, 0, sallocx(ptr, flags));
}
return (ptr);
}
static inline void
sdallocx(void *ptr, size_t size, int flags) {
UNUSED(size);
UNUSED(flags);
free(ptr);
}
static inline void *
rallocx(void *ptr, size_t size, int flags) {
void *new_ptr;
size_t old_size, new_size;
REQUIRE(size != 0);
if ((flags & MALLOCX_ZERO) != 0) {
old_size = sallocx(ptr, flags);
}
new_ptr = realloc(ptr, size);
INSIST(new_ptr != NULL);
if ((flags & MALLOCX_ZERO) != 0) {
new_size = sallocx(new_ptr, flags);
if (new_size > old_size) {
memset((uint8_t *)new_ptr + old_size, 0,
new_size - old_size);
}
}
return (new_ptr);
}
#else /* defined(HAVE_MALLOC_SIZE) || defined (HAVE_MALLOC_USABLE_SIZE) */
#include <stdlib.h> #include <stdlib.h>
typedef union { typedef union {
@@ -135,21 +52,16 @@ mallocx(size_t size, int flags) {
} }
static inline void static inline void
sdallocx(void *ptr, size_t size, int flags) { sdallocx(void *ptr, size_t size ISC_ATTR_UNUSED, int flags ISC_ATTR_UNUSED) {
size_info *si = &(((size_info *)ptr)[-1]); size_info *si = &(((size_info *)ptr)[-1]);
UNUSED(size);
UNUSED(flags);
free(si); free(si);
} }
static inline size_t static inline size_t
sallocx(void *ptr, int flags) { sallocx(void *ptr, int flags ISC_ATTR_UNUSED) {
size_info *si = &(((size_info *)ptr)[-1]); size_info *si = &(((size_info *)ptr)[-1]);
UNUSED(flags);
return (si[0].size); return (si[0].size);
} }
@@ -169,6 +81,4 @@ rallocx(void *ptr, size_t size, int flags) {
return (ptr); return (ptr);
} }
#endif /* defined(HAVE_MALLOC_SIZE) || defined (HAVE_MALLOC_USABLE_SIZE) */
#endif /* !defined(HAVE_JEMALLOC) */ #endif /* !defined(HAVE_JEMALLOC) */