ensure canary is setup if stack-prot libs are dlopen'd into non-ssp app

previously, this usage could lead to a crash if the thread pointer was
still uninitialized, and otherwise would just cause the canary to be
zero (less secure).
This commit is contained in:
Rich Felker
2012-08-25 17:24:46 -04:00
parent 2bd05a4fc2
commit 731e8ffdcf
2 changed files with 6 additions and 2 deletions
+2 -1
View File
@@ -14,7 +14,8 @@ void __init_ssp(size_t *auxv)
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;
a_cas_l(&__stack_chk_guard, 0, canary);
self->canary = __stack_chk_guard;
}
void __stack_chk_fail(void)