mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 09:58:09 +00:00
Code Issues Releases Wiki Activity

rpc: Support setting images_dir by path.

Browse Source 
Google's RPC client process is in a different pidns and has more privileges --
CRIU can't open its /proc/<pid>/fd/<fd>.  For images_dir_fd to be useful here
it would need to refer to a passed or CRIU's fd.

From: Michał Cłapiński <mclapinski@google.com>
Change-Id: Icbfb5af6844b21939a15f6fbb5b02264c12341b1
Signed-off-by: Michał Mirosław <emmir@google.com>
This commit is contained in:
Michał Mirosław 2023-06-22 17:38:33 +02:00 committed by Andrei Vagin
parent 439b522433
commit 2aa9cb9333
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
criu/cr-service.c
View File

@ -382,8 +382,14 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
*/ */
if (imgs_changed_by_rpc_conf) if (imgs_changed_by_rpc_conf)
strncpy(images_dir_path, opts.imgs_dir, PATH_MAX - 1); strncpy(images_dir_path, opts.imgs_dir, PATH_MAX - 1);
else else if (req->images_dir_fd != -1)
sprintf(images_dir_path, "/proc/%d/fd/%d", ids.pid, req->images_dir_fd); sprintf(images_dir_path, "/proc/%d/fd/%d", ids.pid, req->images_dir_fd);
else if (req->images_dir)
strncpy(images_dir_path, req->images_dir, PATH_MAX - 1);
else {
pr_err("Neither images_dir_fd nor images_dir was passed by RPC client.\n");
goto err;
}
if (req->parent_img) if (req->parent_img)
SET_CHAR_OPTS(img_parent, req->parent_img); SET_CHAR_OPTS(img_parent, req->parent_img);

3
images/rpc.proto
View File

@ -61,7 +61,8 @@ enum criu_pre_dump_mode {
}; };
message criu_opts { message criu_opts {
required int32 images_dir_fd = 1; required int32 images_dir_fd = 1 [default = -1];
optional string images_dir = 68; /* used only if images_dir_fd == -1 */
optional int32 pid = 2; /* if not set on dump, will dump requesting process */ optional int32 pid = 2; /* if not set on dump, will dump requesting process */
optional bool leave_running = 3; optional bool leave_running = 3;