mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-28 21:07:43 +00:00
Code Issues Releases Wiki Activity

pagemap-cache: handle short reads

Browse Source 
It is possible for pread() to return fewer number of bytes than
requested. In such case, we need to repeat the read operation
with appropriate offset.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
This commit is contained in:
Andrei Vagin 2024-05-23 14:21:17 +01:00
parent cc88b1e1ff
commit e7276cf63b
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
criu/pagemap-cache.c
View File

@ -165,7 +165,7 @@ static int pmc_fill_cache(pmc_t *pmc, const struct vma_area *vma)
int pmc_fill(pmc_t *pmc, u64 start, u64 end) int pmc_fill(pmc_t *pmc, u64 start, u64 end)
{ {
size_t size_map; size_t size_map, off;
pmc->start = start; pmc->start = start;
pmc->end = end; pmc->end = end;
@ -204,10 +204,17 @@ int pmc_fill(pmc_t *pmc, u64 start, u64 end)
pmc->regs_idx = 0; pmc->regs_idx = 0;
pmc->end = args.walk_end; pmc->end = args.walk_end;
} else { } else {
if (pread(pmc->fd, pmc->map, size_map, PAGEMAP_PFN_OFF(pmc->start)) != size_map) { for (off = 0; off != size_map;) {
pmc_zap(pmc); ssize_t ret;
pr_perror("Can't read %d's pagemap file", pmc->pid); char *ptr = (char *)pmc->map;
return -1;
ret = pread(pmc->fd, ptr + off, size_map - off, PAGEMAP_PFN_OFF(pmc->start) + off);
if (ret == -1) {
pmc_zap(pmc);
pr_perror("Can't read %d's pagemap file", pmc->pid);
return -1;
}
off += ret;
} }
} }