[CRIU] [PATCH 2/3] service: call kerndat_init() before feature check

Andrei Vagin avagin at gmail.com
Sun Oct 14 19:44:16 MSK 2018


setup_opts_from_req() sets up logging and call kerndat_init().

Investigated-by: Adrian Reber <areber at redhat.com>
Fixes: 6e04f3b2dd06 ("criu: call kerndat_init() after log_init()")
Signed-off-by: Andrei Vagin <avagin at gmail.com>
---
 criu/cr-service.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index af9ccddd2..993837bb6 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -971,6 +971,9 @@ static int handle_feature_check(int sk, CriuReq * msg)
 	}
 
 	if (pid == 0) {
+		/* kerndat_init() is called from setup_opts_from_req() */
+		if (setup_opts_from_req(sk, msg->opts))
+			goto out;
 
 		setproctitle("feature-check --rpc");
 
-- 
2.14.4



More information about the CRIU mailing list