qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/pthread/unwind-forcedunwind.c: Encrypt all function 

pointer variables.
This commit is contained in:
Ulrich Drepper 2009-01-29 20:52:36 +00:00
parent cca50323b6
commit 7f901dd7ca
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nptl/ChangeLog
View File

@ -1,5 +1,8 @@
2009-01-29 Ulrich Drepper <drepper@redhat.com> 2009-01-29 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/unwind-forcedunwind.c: Encrypt all function
pointer variables.
* allocatestack.c (__free_stacks): Renamed from free_stacks. * allocatestack.c (__free_stacks): Renamed from free_stacks.
(__free_stack_cache): Removed. Change callers to call __free_stacks. (__free_stack_cache): Removed. Change callers to call __free_stacks.
* init.c (nptl_freeres): New function. * init.c (nptl_freeres): New function.

39
nptl/sysdeps/pthread/unwind-forcedunwind.c
View File

@ -21,6 +21,7 @@
#include <stdio.h> #include <stdio.h>
#include <unwind.h> #include <unwind.h>
#include <pthreadP.h> #include <pthreadP.h>
#include <sysdep.h>
static void *libgcc_s_handle; static void *libgcc_s_handle;
static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
@ -35,7 +36,10 @@ void
__attribute_noinline__ __attribute_noinline__
pthread_cancel_init (void) pthread_cancel_init (void)
{ {
void *resume, *personality, *forcedunwind, *getcfa; void *resume;
void *personality;
void *forcedunwind;
void *getcfa;
void *handle; void *handle;
if (__builtin_expect (libgcc_s_handle != NULL, 1)) if (__builtin_expect (libgcc_s_handle != NULL, 1))
@ -59,9 +63,13 @@ pthread_cancel_init (void)
) )
__libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n"); __libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n");
PTR_MANGLE (resume);
libgcc_s_resume = resume; libgcc_s_resume = resume;
PTR_MANGLE (personality);
libgcc_s_personality = personality; libgcc_s_personality = personality;
PTR_MANGLE (forcedunwind);
libgcc_s_forcedunwind = forcedunwind; libgcc_s_forcedunwind = forcedunwind;
PTR_MANGLE (getcfa);
libgcc_s_getcfa = getcfa; libgcc_s_getcfa = getcfa;
/* Make sure libgcc_s_handle is written last. Otherwise, /* Make sure libgcc_s_handle is written last. Otherwise,
pthread_cancel_init might return early even when the pointer the pthread_cancel_init might return early even when the pointer the
@ -85,10 +93,12 @@ __unwind_freeres (void)
void void
_Unwind_Resume (struct _Unwind_Exception *exc) _Unwind_Resume (struct _Unwind_Exception *exc)
{ {
if (__builtin_expect (libgcc_s_resume == NULL, 0)) if (__builtin_expect (libgcc_s_handle == NULL, 0))
pthread_cancel_init (); pthread_cancel_init ();
libgcc_s_resume (exc); void (*resume) (struct _Unwind_Exception *exc) = libgcc_s_resume;
PTR_DEMANGLE (resume);
resume (exc);
} }
_Unwind_Reason_Code _Unwind_Reason_Code
@ -97,28 +107,37 @@ __gcc_personality_v0 (int version, _Unwind_Action actions,
struct _Unwind_Exception *ue_header, struct _Unwind_Exception *ue_header,
struct _Unwind_Context *context) struct _Unwind_Context *context)
{ {
if (__builtin_expect (libgcc_s_personality == NULL, 0)) if (__builtin_expect (libgcc_s_handle == NULL, 0))
pthread_cancel_init (); pthread_cancel_init ();
return libgcc_s_personality (version, actions, exception_class, _Unwind_Reason_Code (*personality)
ue_header, context); (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
struct _Unwind_Context *) = libgcc_s_personality;
PTR_DEMANGLE (personality);
return personality (version, actions, exception_class, ue_header, context);
} }
_Unwind_Reason_Code _Unwind_Reason_Code
_Unwind_ForcedUnwind (struct _Unwind_Exception *exc, _Unwind_Stop_Fn stop, _Unwind_ForcedUnwind (struct _Unwind_Exception *exc, _Unwind_Stop_Fn stop,
void *stop_argument) void *stop_argument)
{ {
if (__builtin_expect (libgcc_s_forcedunwind == NULL, 0)) if (__builtin_expect (libgcc_s_handle == NULL, 0))
pthread_cancel_init (); pthread_cancel_init ();
return libgcc_s_forcedunwind (exc, stop, stop_argument); _Unwind_Reason_Code (*forcedunwind)
(struct _Unwind_Exception *, _Unwind_Stop_Fn, void *)
= libgcc_s_forcedunwind;
PTR_DEMANGLE (forcedunwind);
return forcedunwind (exc, stop, stop_argument);
} }
_Unwind_Word _Unwind_Word
_Unwind_GetCFA (struct _Unwind_Context *context) _Unwind_GetCFA (struct _Unwind_Context *context)
{ {
if (__builtin_expect (libgcc_s_getcfa == NULL, 0)) if (__builtin_expect (libgcc_s_handle == NULL, 0))
pthread_cancel_init (); pthread_cancel_init ();
return libgcc_s_getcfa (context); _Unwind_Word (*getcfa) (struct _Unwind_Context *) = libgcc_s_getcfa;
PTR_DEMANGLE (getcfa);
return getcfa (context);
} }