upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtld obj_remap_relro(): unindent the loop body

Browse source 
Discussed with:	emaste, imp
Sponsored by:	The FreeBSD Foundation
Differential revision:	https://reviews.freebsd.org/D48509
This commit is contained in:
Konstantin Belousov 2025-01-19 01:23:28 +02:00
parent 7e2f38311e
commit bf3fbf74d1
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libexec/rtld-elf/rtld.c
View file

@ -5987,20 +5987,18 @@ obj_remap_relro(Obj_Entry *obj, int prot)
for (ph = obj->phdr; (const char *)ph < (const char *)obj->phdr +
obj->phsize; ph++) {
switch (ph->p_type) {
case PT_GNU_RELRO:
relro_page = obj->relocbase +
rtld_trunc_page(ph->p_vaddr);
relro_size = rtld_round_page(ph->p_vaddr +
ph->p_memsz) - rtld_trunc_page(ph->p_vaddr);
if (mprotect(relro_page, relro_size, prot) == -1) {
_rtld_error(
if (ph->p_type != PT_GNU_RELRO)
continue;
relro_page = obj->relocbase + rtld_trunc_page(ph->p_vaddr);
relro_size = rtld_round_page(ph->p_vaddr + ph->p_memsz) -
rtld_trunc_page(ph->p_vaddr);
if (mprotect(relro_page, relro_size, prot) == -1) {
_rtld_error(
"%s: Cannot set relro protection to %#x: %s",
obj->path, prot, rtld_strerror(errno));
return (-1);
}
break;
obj->path, prot, rtld_strerror(errno));
return (-1);
}
break;
}
return (0);
}