mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-26 10:53:39 +01:00
17fb2856c3
The above commit fixed handling overaligned TLS segments in libc's TLS Variant I implementation, but rtld provides its own implementation for dynamically-linked executables which lacks these fixes. Thus, port these changes to rtld. This was previously commited as r337978 and reverted in r338149 due to exposing a bug the ARM rtld. This bug was fixed in r338317 by mmel. Submitted by: James Clarke Approved by: re (kib) Reviewed by: kbowling Testing by: kbowling (powerpc64), br (riscv), kevans (armv7) Obtained from: CheriBSD Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D16510
90 lines
3.0 KiB
C
90 lines
3.0 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
|
*
|
|
* Copyright (c) 1999, 2000 John D. Polstra.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef RTLD_MACHDEP_H
|
|
#define RTLD_MACHDEP_H 1
|
|
|
|
#include <sys/types.h>
|
|
#include <machine/atomic.h>
|
|
#include <machine/acle-compat.h>
|
|
|
|
struct Struct_Obj_Entry;
|
|
|
|
/* Return the address of the .dynamic section in the dynamic linker. */
|
|
#define rtld_dynamic(obj) (&_DYNAMIC)
|
|
|
|
Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target,
|
|
const struct Struct_Obj_Entry *defobj, const struct Struct_Obj_Entry *obj,
|
|
const Elf_Rel *rel);
|
|
|
|
#define make_function_pointer(def, defobj) \
|
|
((defobj)->relocbase + (def)->st_value)
|
|
|
|
#define call_initfini_pointer(obj, target) \
|
|
(((InitFunc)(target))())
|
|
|
|
#define call_init_pointer(obj, target) \
|
|
(((InitArrFunc)(target))(main_argc, main_argv, environ))
|
|
|
|
#define call_ifunc_resolver(ptr) \
|
|
(((Elf_Addr (*)(void))ptr)())
|
|
|
|
#define TLS_TCB_SIZE 8
|
|
typedef struct {
|
|
unsigned long ti_module;
|
|
unsigned long ti_offset;
|
|
} tls_index;
|
|
|
|
#define round(size, align) \
|
|
(((size) + (align) - 1) & ~((align) - 1))
|
|
#define calculate_first_tls_offset(size, align) \
|
|
round(8, align)
|
|
#define calculate_tls_offset(prev_offset, prev_size, size, align) \
|
|
round(prev_offset + prev_size, align)
|
|
#define calculate_tls_end(off, size) ((off) + (size))
|
|
#define calculate_tls_post_size(align) \
|
|
round(TLS_TCB_SIZE, align) - TLS_TCB_SIZE
|
|
|
|
extern void *__tls_get_addr(tls_index *ti);
|
|
|
|
#define RTLD_DEFAULT_STACK_PF_EXEC PF_X
|
|
#define RTLD_DEFAULT_STACK_EXEC PROT_EXEC
|
|
|
|
extern void arm_abi_variant_hook(Elf_Auxinfo **);
|
|
|
|
#ifdef __ARM_FP
|
|
#define md_abi_variant_hook(x) arm_abi_variant_hook(x)
|
|
#define RTLD_VARIANT_ENV_NAMES
|
|
#else
|
|
#define md_abi_variant_hook(x)
|
|
#endif
|
|
|
|
#endif
|