[CRIU] [PATCH] restore: unlock network before disabling repair mode on sockets

Andrey Vagin avagin at openvz.org
Sun Jul 14 09:47:56 EDT 2013


Window probe is sent during disabling repair mode on a socket, so
network must be unlocked in this moment.

https://bugzilla.openvz.org/show_bug.cgi?id=2670
Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 cr-restore.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cr-restore.c b/cr-restore.c
index 1d014e1..d7f1e31 100644
--- a/cr-restore.c
+++ b/cr-restore.c
@@ -1300,6 +1300,13 @@ static int restore_root_task(struct pstree_item *init)
 		goto out;
 
 	pr_info("Wait until all tasks are restored\n");
+	ret = restore_wait_inprogress_tasks();
+	if (ret < 0)
+		goto out;
+
+	/* Unlock network before disabling repair mode on sockets */
+	network_unlock();
+
 	ret = restore_switch_stage(CR_STATE_RESTORE_CREDS);
 	if (ret < 0)
 		goto out;
@@ -1313,7 +1320,6 @@ static int restore_root_task(struct pstree_item *init)
 		goto out;
 	}
 
-	network_unlock();
 out:
 	if (ret < 0) {
 		struct pstree_item *pi;
-- 
1.8.3.1



More information about the CRIU mailing list