overhaul SSP support to use a real canary

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).
This commit is contained in:
Rich Felker
2012-05-03 20:42:45 -04:00
parent e765239f33
commit 58aa5f45ed
6 changed files with 25 additions and 12 deletions
+4
View File
@@ -22,8 +22,12 @@
struct pthread {
struct pthread *self;
void *dtv, *unused1, *unused2;
uintptr_t sysinfo;
uintptr_t canary;
pid_t tid, pid;
int tsd_used, errno_val, *errno_ptr;
/* All cancellation-related fields must remain together, in order */
volatile uintptr_t cp_sp, cp_ip;
volatile int cancel, canceldisable, cancelasync;
unsigned char *map_base;