mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 22:05:36 +00:00
Code Issues Releases Wiki Activity

criu/pie/parasite-vdso: Handle also systems without VVAR

Browse Source 
On s390 we don't use vvar. Therefore vvar_size in not been initialized
and the value remains VVAR_BAD_SIZE.

Fix the BUG() statement to also cover this case.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Michael Holzheu
2017-06-29 21:24:40 +02:00
committed by Andrei Vagin
parent aff44dd424
commit 773fd40463
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
criu/pie/parasite-vdso.c
View File

@@ -44,9 +44,11 @@ static int vdso_remap(char *who, unsigned long from, unsigned long to, size_t si
/* Park runtime vDSO in some safe place where it can be accessible from restorer */
int vdso_do_park(struct vdso_maps *rt, unsigned long park_at, unsigned long park_size)
{
unsigned long vvar_size;
int ret;
BUG_ON((rt->sym.vdso_size + rt->sym.vvar_size) < park_size);
vvar_size = (rt->sym.vvar_size == VVAR_BAD_SIZE) ? 0 : rt->sym.vvar_size;
BUG_ON((rt->sym.vdso_size + vvar_size) < park_size);
if (rt->vvar_start != VVAR_BAD_ADDR) {
if (rt->sym.vdso_before_vvar) {