Skip to content

C
criu
Commit 7b7f09e4 authored by Pavel Emelyanov's avatar Pavel Emelyanov
Browse files
Options

sanitize vma types parsing 

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 446b6526
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
cr-dump.c
View file @ 7b7f09e4
...@@ -434,8 +434,6 @@ static int dump_task_mappings(pid_t pid, struct list_head *vma_area_list, struct ...@@ -434,8 +434,6 @@ static int dump_task_mappings(pid_t pid, struct list_head *vma_area_list, struct
pr_info_vma(vma_area); pr_info_vma(vma_area);
if (vma->flags & (MAP_SHARED | MAP_PRIVATE)) {
if (vma_entry_is(vma, VMA_ANON_SHARED)) { if (vma_entry_is(vma, VMA_ANON_SHARED)) {
struct shmem_entry e; struct shmem_entry e;
...@@ -467,10 +465,6 @@ static int dump_task_mappings(pid_t pid, struct list_head *vma_area_list, struct ...@@ -467,10 +465,6 @@ static int dump_task_mappings(pid_t pid, struct list_head *vma_area_list, struct
if (ret) if (ret)
goto err; goto err;
} }
} else {
pr_err("Unknown VMA (pid: %d)\n", pid);
goto err;
}
} }
ret = 0; ret = 0;
......
proc_parse.c
View file @ 7b7f09e4
...@@ -93,6 +93,10 @@ int parse_maps(pid_t pid, struct list_head *vma_area_list, bool use_map_files) ...@@ -93,6 +93,10 @@ int parse_maps(pid_t pid, struct list_head *vma_area_list, bool use_map_files)
vma_area->vma.flags = MAP_SHARED; vma_area->vma.flags = MAP_SHARED;
else if (s == 'p') else if (s == 'p')
vma_area->vma.flags = MAP_PRIVATE; vma_area->vma.flags = MAP_PRIVATE;
else {
pr_err("Unexpected VMA met (%c)\n", s);
goto err;
}
if (strstr(big_buffer, "[stack]")) { if (strstr(big_buffer, "[stack]")) {
vma_area->vma.status |= VMA_AREA_REGULAR | VMA_AREA_STACK; vma_area->vma.status |= VMA_AREA_REGULAR | VMA_AREA_STACK;
......
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