d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid using [LINUX_]SHAREDPAGE constant directly in the vdso code.

Browse Source 
This is needed for https://reviews.freebsd.org/D11780.

Reported by:	kib@
This commit is contained in:
Dmitry Chagin 2017-07-30 21:24:20 +00:00
parent 2e639013ed
commit c151945c86
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/linux/linux_sysvec.c
View File

@ -844,14 +844,14 @@ linux_vdso_install(void *param)
linux_shared_page_obj = __elfN(linux_shared_page_init)
(&linux_shared_page_mapping);
__elfN(linux_vdso_reloc)(&elf_linux_sysvec, SHAREDPAGE);
__elfN(linux_vdso_reloc)(&elf_linux_sysvec);
bcopy(elf_linux_sysvec.sv_sigcode, linux_shared_page_mapping,
linux_szsigcode);
elf_linux_sysvec.sv_shared_page_obj = linux_shared_page_obj;
linux_kplatform = linux_shared_page_mapping +
(linux_platform - (caddr_t)SHAREDPAGE);
(linux_platform - (caddr_t)elf_linux_sysvec.sv_shared_page_base);
}
SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_ANY,
(sysinit_cfunc_t)linux_vdso_install, NULL);

4
sys/amd64/linux32/linux32_sysvec.c
View File

@ -1062,14 +1062,14 @@ linux_vdso_install(void *param)
linux_shared_page_obj = __elfN(linux_shared_page_init)
(&linux_shared_page_mapping);
__elfN(linux_vdso_reloc)(&elf_linux_sysvec, LINUX32_SHAREDPAGE);
__elfN(linux_vdso_reloc)(&elf_linux_sysvec);
bcopy(elf_linux_sysvec.sv_sigcode, linux_shared_page_mapping,
linux_szsigcode);
elf_linux_sysvec.sv_shared_page_obj = linux_shared_page_obj;
linux_kplatform = linux_shared_page_mapping +
(linux_platform - (caddr_t)LINUX32_SHAREDPAGE);
(linux_platform - (caddr_t)elf_linux_sysvec.sv_shared_page_base);
}
SYSINIT(elf_linux_vdso_init, SI_SUB_EXEC, SI_ORDER_ANY,
(sysinit_cfunc_t)linux_vdso_install, NULL);

16
sys/compat/linux/linux_vdso.c
View File

@ -139,7 +139,7 @@ __elfN(linux_vdso_fixup)(struct sysentvec *sv)
}
void
__elfN(linux_vdso_reloc)(struct sysentvec *sv, long vdso_adjust)
__elfN(linux_vdso_reloc)(struct sysentvec *sv)
{
struct linux_vdso_sym *lsym;
Elf_Ehdr *ehdr;
@ -152,13 +152,13 @@ __elfN(linux_vdso_reloc)(struct sysentvec *sv, long vdso_adjust)
ehdr = (Elf_Ehdr *) sv->sv_sigcode;
/* Adjust our so relative to the sigcode_base */
if (vdso_adjust != 0) {
ehdr->e_entry += vdso_adjust;
if (sv->sv_shared_page_base != 0) {
ehdr->e_entry += sv->sv_shared_page_base;
phdr = (Elf_Phdr *)((caddr_t)ehdr + ehdr->e_phoff);
/* phdrs */
for (i = 0; i < ehdr->e_phnum; i++) {
phdr[i].p_vaddr += vdso_adjust;
phdr[i].p_vaddr += sv->sv_shared_page_base;
if (phdr[i].p_type != PT_DYNAMIC)
continue;
dyn = (Elf_Dyn *)((caddr_t)ehdr + phdr[i].p_offset);
@ -178,13 +178,13 @@ __elfN(linux_vdso_reloc)(struct sysentvec *sv, long vdso_adjust)
case DT_VERDEF:
case DT_VERNEED:
case DT_ADDRRNGLO ... DT_ADDRRNGHI:
dyn->d_un.d_ptr += vdso_adjust;
dyn->d_un.d_ptr += sv->sv_shared_page_base;
break;
case DT_ENCODING ... DT_LOOS-1:
case DT_LOOS ... DT_HIOS:
if (dyn->d_tag >= DT_ENCODING &&
(dyn->d_tag & 1) == 0)
dyn->d_un.d_ptr += vdso_adjust;
dyn->d_un.d_ptr += sv->sv_shared_page_base;
break;
default:
break;
@ -197,7 +197,7 @@ __elfN(linux_vdso_reloc)(struct sysentvec *sv, long vdso_adjust)
for(i = 0; i < ehdr->e_shnum; i++) {
if (!(shdr[i].sh_flags & SHF_ALLOC))
continue;
shdr[i].sh_addr += vdso_adjust;
shdr[i].sh_addr += sv->sv_shared_page_base;
if (shdr[i].sh_type != SHT_SYMTAB &&
shdr[i].sh_type != SHT_DYNSYM)
continue;
@ -209,7 +209,7 @@ __elfN(linux_vdso_reloc)(struct sysentvec *sv, long vdso_adjust)
if (sym->st_shndx == SHN_UNDEF ||
sym->st_shndx == SHN_ABS)
continue;
sym->st_value += vdso_adjust;
sym->st_value += sv->sv_shared_page_base;
}
}
}

2
sys/compat/linux/linux_vdso.h
View File

@ -41,7 +41,7 @@ struct linux_vdso_sym {
vm_object_t __elfN(linux_shared_page_init)(char **);
void __elfN(linux_shared_page_fini)(vm_object_t);
void __elfN(linux_vdso_fixup)(struct sysentvec *);
void __elfN(linux_vdso_reloc)(struct sysentvec *, long);
void __elfN(linux_vdso_reloc)(struct sysentvec *);
void __elfN(linux_vdso_sym_init)(struct linux_vdso_sym *);
#define LINUX_VDSO_SYM_INTPTR(name) \

2
sys/i386/linux/linux_sysvec.c
View File

@ -1044,7 +1044,7 @@ linux_vdso_install(void *param)
linux_shared_page_obj = __elfN(linux_shared_page_init)
(&linux_shared_page_mapping);
__elfN(linux_vdso_reloc)(&elf_linux_sysvec, LINUX_SHAREDPAGE);
__elfN(linux_vdso_reloc)(&elf_linux_sysvec);
bcopy(elf_linux_sysvec.sv_sigcode, linux_shared_page_mapping,
linux_szsigcode);