bd43f0691c
do not participate in the global symbols namespace, but rtld locks are still replaced and functions are interposed. In particular, __pthread_map_stacks_exec is resolved to the libc version. If a library is loaded later, which requires adjustment of the stack protection mode, rtld calls into libc __pthread_map_stacks_exec due to the symbols scope. The libc version might recurse into binder and recursively acquire rtld bind lock, causing the hang. Make libc __pthread_map_stacks_exec() interposed, which synchronizes rtld locks and version of the stack exec hook when libthr loaded, regardless of the symbol scope control or symbol resolution order. The __pthread_map_stacks_exec() symbol is removed from the private version in libthr since libc symbol now operates correctly in presence of libthr. Reported and tested by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks
85 lines
2.6 KiB
C
85 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 2010 Konstantin Belousov <kib@freebsd.org>
|
|
* 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. Neither the name of the author nor the names of any co-contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* 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$
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/resource.h>
|
|
#include <sys/sysctl.h>
|
|
#include <link.h>
|
|
#include <stddef.h>
|
|
#include "libc_private.h"
|
|
|
|
int __elf_phdr_match_addr(struct dl_phdr_info *, void *);
|
|
void __pthread_map_stacks_exec(void);
|
|
|
|
int
|
|
__elf_phdr_match_addr(struct dl_phdr_info *phdr_info, void *addr)
|
|
{
|
|
const Elf_Phdr *ph;
|
|
int i;
|
|
|
|
for (i = 0; i < phdr_info->dlpi_phnum; i++) {
|
|
ph = &phdr_info->dlpi_phdr[i];
|
|
if (ph->p_type != PT_LOAD || (ph->p_flags & PF_X) == 0)
|
|
continue;
|
|
if (phdr_info->dlpi_addr + ph->p_vaddr <= (uintptr_t)addr &&
|
|
(uintptr_t)addr + sizeof(addr) < phdr_info->dlpi_addr +
|
|
ph->p_vaddr + ph->p_memsz)
|
|
break;
|
|
}
|
|
return (i != phdr_info->dlpi_phnum);
|
|
}
|
|
|
|
void
|
|
__libc_map_stacks_exec(void)
|
|
{
|
|
int mib[2];
|
|
struct rlimit rlim;
|
|
u_long usrstack;
|
|
size_t len;
|
|
|
|
mib[0] = CTL_KERN;
|
|
mib[1] = KERN_USRSTACK;
|
|
len = sizeof(usrstack);
|
|
if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), &usrstack, &len, NULL, 0)
|
|
== -1)
|
|
return;
|
|
if (getrlimit(RLIMIT_STACK, &rlim) == -1)
|
|
return;
|
|
mprotect((void *)(uintptr_t)(usrstack - rlim.rlim_cur),
|
|
rlim.rlim_cur, _rtld_get_stack_prot());
|
|
}
|
|
|
|
#pragma weak __pthread_map_stacks_exec
|
|
void
|
|
__pthread_map_stacks_exec(void)
|
|
{
|
|
|
|
((void (*)(void))__libc_interposing[INTERPOS_map_stacks_exec])();
|
|
}
|