mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-04 08:15:37 +00:00
Code Issues Releases Wiki Activity

vdso: x86 -- Test VMAs order in vdso_proxify

Browse Source 
Make sure we really can do inplace remap.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Cyrill Gorcunov
2014-07-18 18:44:50 +04:00
committed by Pavel Emelyanov
parent b8d0b9c773
commit b00bdb2dbc
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/vdso-pie.c
View File

@@ -288,7 +288,8 @@ int vdso_proxify(char *who, struct vdso_symtable *sym_rt,
* instead of one in image.
*
* In case if VVAR area is present at least it must have same
* size as dumped one for inplace remap.
* size as dumped one for inplace remap, also the order of zones
* must be matching.
*/
if (size == vdso_vma_size(sym_rt)) {
size_t i;
@@ -300,8 +301,15 @@ int vdso_proxify(char *who, struct vdso_symtable *sym_rt,
if (i == ARRAY_SIZE(s.symbols)) {
remap_rt = true;
if (vvar_vma && sym_rt->vvar_start != VVAR_BAD_ADDR)
if (vvar_vma && sym_rt->vvar_start != VVAR_BAD_ADDR) {
remap_rt = (vvar_vma_size(sym_rt) == vma_entry_len(vvar_vma));
if (remap_rt) {
long delta_rt = sym_rt->vvar_start - sym_rt->vma_start;
long delta_this = vvar_vma->start - vdso_vma->start;
remap_rt = (delta_rt ^ delta_this) < 0 ? false : true;
}
}
}
}