Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhul
criu
Commits
131d4b86
Commit
131d4b86
authored
Mar 04, 2015
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mem: Sanitize error path in prepare_mappings()
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
fce8cac1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
10 deletions
+14
-10
cr-restore.c
cr-restore.c
+14
-10
No files found.
cr-restore.c
View file @
131d4b86
...
@@ -534,8 +534,9 @@ static int prepare_mappings(int pid)
...
@@ -534,8 +534,9 @@ static int prepare_mappings(int pid)
/* Reserve a place for mapping private vma-s one by one */
/* Reserve a place for mapping private vma-s one by one */
addr
=
mmap
(
NULL
,
vmas
->
priv_size
,
PROT_NONE
,
MAP_PRIVATE
|
MAP_ANONYMOUS
,
0
,
0
);
addr
=
mmap
(
NULL
,
vmas
->
priv_size
,
PROT_NONE
,
MAP_PRIVATE
|
MAP_ANONYMOUS
,
0
,
0
);
if
(
addr
==
MAP_FAILED
)
{
if
(
addr
==
MAP_FAILED
)
{
ret
=
-
1
;
pr_perror
(
"Unable to reserve memory (%lu bytes)"
,
vmas
->
priv_size
);
pr_perror
(
"Unable to reserve memory (%lu bytes)"
,
vmas
->
priv_size
);
return
-
1
;
goto
out
;
}
}
old_premmapped_addr
=
rsti
(
current
)
->
premmapped_addr
;
old_premmapped_addr
=
rsti
(
current
)
->
premmapped_addr
;
...
@@ -544,18 +545,21 @@ static int prepare_mappings(int pid)
...
@@ -544,18 +545,21 @@ static int prepare_mappings(int pid)
rsti
(
current
)
->
premmapped_len
=
vmas
->
priv_size
;
rsti
(
current
)
->
premmapped_len
=
vmas
->
priv_size
;
ret
=
premap_priv_vmas
(
pid
,
vmas
,
addr
);
ret
=
premap_priv_vmas
(
pid
,
vmas
,
addr
);
if
(
ret
==
0
)
if
(
ret
<
0
)
ret
=
restore_priv_vma_content
(
pid
)
;
goto
out
;
out:
ret
=
restore_priv_vma_content
(
pid
);
if
(
old_premmapped_addr
&&
if
(
ret
<
0
)
munmap
(
old_premmapped_addr
,
old_premmapped_len
))
{
goto
out
;
pr_perror
(
"Unable to unmap %p(%lx)"
,
old_premmapped_addr
,
old_premmapped_len
);
return
-
1
;
}
if
(
old_premmapped_addr
)
{
ret
=
munmap
(
old_premmapped_addr
,
old_premmapped_len
);
if
(
ret
<
0
)
pr_perror
(
"Unable to unmap %p(%lx)"
,
old_premmapped_addr
,
old_premmapped_len
);
}
out:
return
ret
;
return
ret
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment