mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 14:55:39 +00:00
Code Issues Releases Wiki Activity

page-read: Don't let pr->pe remain NULL

Browse Source 
CID 172196, issues/233.

The advance method can keep pr->pe NULL while the rest of
the code doesn't count on that.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Acked-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
This commit is contained in:
Pavel Emelyanov
2016-11-30 14:06:10 +03:00
parent 5d8e80d607
commit 4a7947aa79
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
criu/pagemap.c
View File

@@ -162,7 +162,7 @@ static void skip_pagemap_pages(struct page_read *pr, unsigned long len)
static int seek_pagemap(struct page_read *pr, unsigned long vaddr) static int seek_pagemap(struct page_read *pr, unsigned long vaddr)
{ {
if (!pr->pe) if (!pr->pe)
advance(pr); goto adv;
do { do {
unsigned long start = pr->pe->vaddr; unsigned long start = pr->pe->vaddr;
@@ -179,6 +179,8 @@ static int seek_pagemap(struct page_read *pr, unsigned long vaddr)
if (end <= vaddr) if (end <= vaddr)
skip_pagemap_pages(pr, end - pr->cvaddr); skip_pagemap_pages(pr, end - pr->cvaddr);
adv:
; /* otherwise "label at end of compound stmt" gcc error */
} while (advance(pr)); } while (advance(pr));
return 0; return 0;