summaryrefslogtreecommitdiff
path: root/src/env
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-08-25 17:24:46 -0400
committerRich Felker <dalias@aerifal.cx>2012-08-25 17:24:46 -0400
commit731e8ffdcf6877c04092aa9fbd2b17907b8846c7 (patch)
tree0212e1ff8516eceab38bd1552322bee7dd11841c /src/env
parent2bd05a4fc26c297754f7ee5745a1c3b072a44b7d (diff)
downloadmusl-731e8ffdcf6877c04092aa9fbd2b17907b8846c7.tar.gz
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).
Diffstat (limited to 'src/env')
-rw-r--r--src/env/__stack_chk_fail.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/env/__stack_chk_fail.c b/src/env/__stack_chk_fail.c
index c6d0feb9..eac852b7 100644
--- a/src/env/__stack_chk_fail.c
+++ b/src/env/__stack_chk_fail.c
@@ -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)