diff options
| author | Rich Felker <dalias@aerifal.cx> | 2020-08-24 22:45:51 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2020-08-27 18:36:45 -0400 |
| commit | 57f6e85c9de417fef5eece2a5b00c1104321f543 (patch) | |
| tree | a975b7e5a36294837ccc19c17c5b8c9a71fa2346 /src/env/__stack_chk_fail.c | |
| parent | 3a5b9ae7cf656648c80fe155a5239d9b4fb4c485 (diff) | |
| download | musl-57f6e85c9de417fef5eece2a5b00c1104321f543.tar.gz musl-57f6e85c9de417fef5eece2a5b00c1104321f543.tar.bz2 musl-57f6e85c9de417fef5eece2a5b00c1104321f543.tar.xz musl-57f6e85c9de417fef5eece2a5b00c1104321f543.zip | |
remove redundant pthread struct members repeated for layout purposes
dtv_copy, canary2, and canary_at_end existed solely to match multiple
ABI and asm-accessed layouts simultaneously. now that pthread_arch.h
can be included before struct __pthread is defined, the struct layout
can depend on macros defined by pthread_arch.h.
Diffstat (limited to 'src/env/__stack_chk_fail.c')
| -rw-r--r-- | src/env/__stack_chk_fail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/env/__stack_chk_fail.c b/src/env/__stack_chk_fail.c index e32596d1..bf5a280a 100644 --- a/src/env/__stack_chk_fail.c +++ b/src/env/__stack_chk_fail.c @@ -9,7 +9,7 @@ void __init_ssp(void *entropy) if (entropy) memcpy(&__stack_chk_guard, entropy, sizeof(uintptr_t)); else __stack_chk_guard = (uintptr_t)&__stack_chk_guard * 1103515245; - __pthread_self()->CANARY = __stack_chk_guard; + __pthread_self()->canary = __stack_chk_guard; } void __stack_chk_fail(void) |