58aa5f45ed
pthread structure has been adjusted to match the glibc/GCC abi for where the canary is stored on i386 and x86_64. it will need variants for other archs to provide the added security of the canary's entropy, but even without that it still works as well as the old "minimal" ssp support. eventually such changes will be made anyway, since they are also needed for GCC/C11 thread-local storage support (not yet implemented). care is taken not to attempt initializing the thread pointer unless the program actually uses SSP (by reference to __stack_chk_fail).
23 lines
492 B
C
23 lines
492 B
C
#include <string.h>
|
|
#include <inttypes.h>
|
|
#include <elf.h>
|
|
#include "pthread_impl.h"
|
|
#include "atomic.h"
|
|
|
|
uintptr_t __stack_chk_guard;
|
|
|
|
void __init_ssp(size_t *auxv)
|
|
{
|
|
size_t i;
|
|
pthread_t self = __pthread_self_init();
|
|
uintptr_t canary;
|
|
for (i=0; auxv[i] && auxv[i]!=AT_RANDOM; i+=2);
|
|
if (auxv[i]) memcpy(&canary, (void *)auxv[i+1], sizeof canary);
|
|
else canary = (uintptr_t)&canary * 1103515245;
|
|
__stack_chk_guard = self->canary = canary;
|
|
}
|
|
|
|
void __stack_chk_fail(void)
|
|
{
|
|
a_crash();
|
|
}
|