RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

impose barrier between thread pointer setup and use for static linking 

this is the analog of commit 1c84c99913
for static linking. unlike with dynamic linking, we don't have
symbolic lookup to use as a barrier. use a dummy (target-agnostic)
degenerate inline asm fragment instead. this technique has precedent
in commit 05ac345f89 where it's used for
explicit_bzero. if it proves problematic in any way, loading the
address of the stage 2 function from a pointer object whose address
leaks to kernelspace during thread pointer init could be used as an
even stronger barrier.
This commit is contained in:
Rich Felker 2018-10-17 22:20:01 -04:00
parent a4a3e4dbc0
commit 4390383b32
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/env/__libc_start_main.c vendored
View File

@ -63,11 +63,24 @@ static void libc_start_init(void)
weak_alias(libc_start_init, __libc_start_init);
static int libc_start_main_stage2(int (*)(int,char **,char **), int, char **);
int __libc_start_main(int (*main)(int,char **,char **), int argc, char **argv)
{
char **envp = argv+argc+1;
__init_libc(envp, argv[0]);
/* Barrier against hoisting application code or anything using ssp
* or thread pointer prior to its initialization above. */
int (*stage2)();
__asm__ ( "" : "=r"(stage2) : "r"(libc_start_main_stage2) : "memory" );
return stage2(main, argc, argv);
}
static int libc_start_main_stage2(int (*main)(int,char **,char **), int argc, char **argv)
{
char **envp = argv+argc+1;
__libc_start_init();
/* Pass control to the application */