Page MenuHomeFreeBSD
Files F162945980

D41150.id125019.diff
No OneTemporary
Actions

D41150.id125019.diff
View Options

diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -419,9 +419,4 @@
void init_pltgot(Obj_Entry *);
void allocate_initial_tls(Obj_Entry *);
-void *__crt_calloc(size_t num, size_t size);
-void __crt_free(void *cp);
-void *__crt_malloc(size_t nbytes);
-void *__crt_realloc(void *cp, size_t nbytes);
-
#endif /* } */
diff --git a/libexec/rtld-elf/rtld_malloc.h b/libexec/rtld-elf/rtld_malloc.h
--- a/libexec/rtld-elf/rtld_malloc.h
+++ b/libexec/rtld-elf/rtld_malloc.h
@@ -34,6 +34,7 @@
#ifndef RTLD_MALLOC_H
#define RTLD_MALLOC_H
+void *__crt_aligned_alloc(size_t align, size_t size);
void *__crt_calloc(size_t num, size_t size);
void __crt_free(void *cp);
void *__crt_malloc(size_t nbytes);
diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c
--- a/libexec/rtld-elf/rtld_malloc.c
+++ b/libexec/rtld-elf/rtld_malloc.c
@@ -53,9 +53,12 @@
#include <stddef.h>
#include <string.h>
#include <unistd.h>
+#ifdef IN_RTLD
#include "rtld.h"
#include "rtld_printf.h"
#include "rtld_paths.h"
+#endif
+#include "rtld_malloc.h"
/*
* Pre-allocate mmap'ed pages
@@ -68,10 +71,6 @@
* contains a pointer to the next free block, and the bottom two bits must
* be zero. When in use, the first byte is set to MAGIC, and the second
* byte is the size index. The remaining bytes are for alignment.
- * If range checking is enabled then a second word holds the size of the
- * requested block, less 1, rounded up to a multiple of sizeof(RMAGIC).
- * The order of elements is critical: ov_magic must overlay the low order
- * bits of ov_next, and ov_magic can not be a valid ov_next bit pattern.
*/
union overhead {
union overhead *ov_next; /* when free */
@@ -87,13 +86,15 @@
static int morepages(int n);
#define MAGIC 0xef /* magic # on accounting info */
+#define AMAGIC 0xdf /* magic # for aligned alloc */
/*
* nextf[i] is the pointer to the next free block of size
* (FIRST_BUCKET_SIZE << i). The overhead information precedes the data
* area returned to the user.
*/
-#define FIRST_BUCKET_SIZE 8
+#define LOW_BITS 3
+#define FIRST_BUCKET_SIZE (1U << LOW_BITS)
#define NBUCKETS 30
static union overhead *nextf[NBUCKETS];
@@ -164,6 +165,25 @@
return (ret);
}
+void *
+__crt_aligned_alloc(size_t align, size_t size)
+{
+ void *mem;
+ union overhead *ov;
+ uintptr_t x;
+
+ if (align < FIRST_BUCKET_SIZE)
+ align = FIRST_BUCKET_SIZE;
+ mem = __crt_malloc(size + 2 * align);
+ if (mem == NULL)
+ return (NULL);
+ ov = (union overhead *)mem;
+ ov->ov_magic = AMAGIC;
+ x = roundup((uintptr_t)mem + sizeof(union overhead), align);
+ ov->ov_index = (x - (uintptr_t)mem) >> LOW_BITS;
+ return ((void *)x);
+}
+
/*
* Allocate more memory to the indicated bucket.
*/
@@ -202,6 +222,12 @@
}
}
+static union overhead *
+cp2op(void *cp)
+{
+ return ((union overhead *)((caddr_t)cp - sizeof(union overhead)));
+}
+
void
__crt_free(void *cp)
{
@@ -210,7 +236,11 @@
if (cp == NULL)
return;
- op = (union overhead *)((caddr_t)cp - sizeof (union overhead));
+ op = cp2op(cp);
+ if (op->ov_magic == AMAGIC) {
+ cp = (caddr_t)cp - (op->ov_index << LOW_BITS);
+ op = cp2op(cp);
+ }
if (op->ov_magic != MAGIC)
return; /* sanity */
size = op->ov_index;
@@ -228,7 +258,7 @@
if (cp == NULL)
return (__crt_malloc(nbytes));
- op = (union overhead *)((caddr_t)cp - sizeof (union overhead));
+ op = cp2op(cp);
if (op->ov_magic != MAGIC)
return (NULL); /* Double-free or bad argument */
i = op->ov_index;

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 19, 2:18 PM (8 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35236457
Default Alt Text
D41150.id125019.diff (3 KB)

Event Timeline