Commit 452cb9d4 authored by Pavel Tikhomirov's avatar Pavel Tikhomirov Committed by Pavel Emelyanov

page-read: fix open_page_read usage

1. Fix uninitialized use of pr in cr_dedup_one_pagemap and get_page:
https://github.com/xemul/criu/issues/178
2. In ud_open, close pr in case of error returned from find_vmas->
collect_uffd_pages as we free lpi with lpi->pr open; so need check in
lpi_fini if uffd is >0 before close

v2:rebase to new criu-dev
Signed-off-by: 's avatarPavel Tikhomirov <ptikhomirov@virtuozzo.com>
Acked-by: 's avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 2076a160
...@@ -75,10 +75,8 @@ static int cr_dedup_one_pagemap(int id, int flags) ...@@ -75,10 +75,8 @@ static int cr_dedup_one_pagemap(int id, int flags)
flags |= PR_MOD; flags |= PR_MOD;
ret = open_page_read(id, &pr, flags); ret = open_page_read(id, &pr, flags);
if (ret <= 0) { if (ret <= 0)
ret = -1; return -1;
goto exit;
}
prp = pr.parent; prp = pr.parent;
if (!prp) if (!prp)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment