svn commit: r362608 - stable/11/libexec/rtld-elf

[Konstantin Belousov]

On Thu, Jun 25, 2020 at 06:39:19AM +0000, Konstantin Belousov wrote:
> Author: kib
> Date: Thu Jun 25 06:39:18 2020
> New Revision: 362608
> URL: https://svnweb.freebsd.org/changeset/base/362608
> 
> Log:
>   MFC r362347:
>   rtld: Apply relro to itself.
On stable/11, due to the configuration of old bfd ld, rtld does not have
relro segment, so this is a merge to keep code similar between branches.

> 
> Modified:
>   stable/11/libexec/rtld-elf/rtld.c
> Directory Properties:
>   stable/11/   (props changed)
> 
> Modified: stable/11/libexec/rtld-elf/rtld.c
> ==============================================================================
> --- stable/11/libexec/rtld-elf/rtld.c	Thu Jun 25 05:44:06 2020	(r362607)
> +++ stable/11/libexec/rtld-elf/rtld.c	Thu Jun 25 06:39:18 2020	(r362608)
> @@ -2209,6 +2209,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info)
>      obj_rtld.path = xstrdup(ld_path_rtld);
>  
>      parse_rtld_phdr(&obj_rtld);
> +    obj_enforce_relro(&obj_rtld);
>  
>      r_debug.r_brk = r_debug_state;
>      r_debug.r_state = RT_CONSISTENT;