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

Update. 

2004-01-22  Jakub Jelinek  <jakub@redhat.com>

	* elf/dl-reloc.c (_dl_relocate_object): Move PT_GNU_RELRO protection
	into...
	(_dl_protect_relro): New routine.
	* sysdeps/generic/ldsodefs.h (_dl_protect_relro): New prototype.
	* elf/rtld.c (_dl_start_final): Copy l_relro_addr and l_relro_size
	from bootstrap_map.
	(_dl_main): Don't set GL(_dl_loaded)->l_relro_{addr,size} here.
	Call _dl_protect_relro for libraries if prelinking.
This commit is contained in:
Ulrich Drepper 2004-01-24 08:36:13 +00:00
parent 75631a5763
commit e8648a5a87
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,14 @@
2004-01-22 Jakub Jelinek <jakub@redhat.com>
* elf/dl-reloc.c (_dl_relocate_object): Move PT_GNU_RELRO protection
into...
(_dl_protect_relro): New routine.
* sysdeps/generic/ldsodefs.h (_dl_protect_relro): New prototype.
* elf/rtld.c (_dl_start_final): Copy l_relro_addr and l_relro_size
from bootstrap_map.
(_dl_main): Don't set GL(_dl_loaded)->l_relro_{addr,size} here.
Call _dl_protect_relro for libraries if prelinking.
2004-01-23 Richard Henderson <rth@redhat.com> 2004-01-23 Richard Henderson <rth@redhat.com>
* Versions.def (libm): Replace GLIBC_2.3.3 with GLIBC_2.3.4. * Versions.def (libm): Replace GLIBC_2.3.3 with GLIBC_2.3.4.
@ -10,8 +21,6 @@
* sysdeps/ieee754/dbl-64/e_pow.c (log2): Rename to my_log2 to * sysdeps/ieee754/dbl-64/e_pow.c (log2): Rename to my_log2 to
avoid warnings for builtin function log2. avoid warnings for builtin function log2.
2004-01-22 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/x86_64/setcontext.S: Add proper unwind * sysdeps/unix/sysv/linux/x86_64/setcontext.S: Add proper unwind
information. information.

13
elf/rtld.c
View File

@ -224,6 +224,8 @@ _dl_start_final (void *arg, struct dl_start_final_info *info)
memcpy (GL(dl_rtld_map).l_info, info->l.l_info, memcpy (GL(dl_rtld_map).l_info, info->l.l_info,
sizeof GL(dl_rtld_map).l_info); sizeof GL(dl_rtld_map).l_info);
GL(dl_rtld_map).l_mach = info->l.l_mach; GL(dl_rtld_map).l_mach = info->l.l_mach;
GL(dl_rtld_map).l_relro_addr = info->l.l_relro_addr;
GL(dl_rtld_map).l_relro_size = info->l.l_relro_size;
#endif #endif
_dl_setup_hash (&GL(dl_rtld_map)); _dl_setup_hash (&GL(dl_rtld_map));
GL(dl_rtld_map).l_opencount = 1; GL(dl_rtld_map).l_opencount = 1;
@ -794,11 +796,6 @@ of this helper program; chances are you did not intend to run this program.\n\
GL(dl_stack_flags) = ph->p_flags; GL(dl_stack_flags) = ph->p_flags;
break; break;
} }
else if (ph->p_type == PT_GNU_RELRO)
{
GL(dl_loaded)->l_relro_addr = ph->p_vaddr;
GL(dl_loaded)->l_relro_size = ph->p_memsz;
}
if (__builtin_expect (mode, normal) == verify) if (__builtin_expect (mode, normal) == verify)
{ {
@ -1676,7 +1673,11 @@ cannot allocate TLS data structures for initial thread");
/* Mark all the objects so we know they have been already relocated. */ /* Mark all the objects so we know they have been already relocated. */
for (l = GL(dl_loaded); l != NULL; l = l->l_next) for (l = GL(dl_loaded); l != NULL; l = l->l_next)
l->l_relocated = 1; {
l->l_relocated = 1;
if (l->l_relro_size)
_dl_protect_relro (l);
}
_dl_sysdep_start_cleanup (); _dl_sysdep_start_cleanup ();
} }

4
sysdeps/generic/ldsodefs.h
View File

@ -697,6 +697,10 @@ extern void _dl_relocate_object_internal (struct link_map *map,
int lazy, int consider_profiling) int lazy, int consider_profiling)
attribute_hidden; attribute_hidden;
/* Protect PT_GNU_RELRO area. */
extern void _dl_protect_relro (struct link_map *map)
internal_function attribute_hidden;
/* Call _dl_signal_error with a message about an unhandled reloc type. /* Call _dl_signal_error with a message about an unhandled reloc type.
TYPE is the result of ELFW(R_TYPE) (r_info), i.e. an R_<CPU>_* value. TYPE is the result of ELFW(R_TYPE) (r_info), i.e. an R_<CPU>_* value.
PLT is nonzero if this was a PLT reloc; it just affects the message. */ PLT is nonzero if this was a PLT reloc; it just affects the message. */