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

criu: generate unique socket names

Browse Source 
CRIU has a few places where it creates unix sockets and their names have to be
unique for each criu run.

Fixes: #1798
Signed-off-by: Andrei Vagin <avagin@google.com>
This commit is contained in:
Andrei Vagin
2022-03-31 23:52:33 -07:00
committed by Andrei Vagin
parent 75064b7424
commit 45e048d77a
7 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compel/include/uapi/infect-util.h
View File

@@ -3,6 +3,12 @@
#include "common/compiler.h" #include "common/compiler.h"
/*
* compel_run_id is a unique value of the current run. It can be used to
* generate resource ID-s to avoid conflicts with other processes.
*/
extern uint64_t compel_run_id;
struct parasite_ctl; struct parasite_ctl;
extern int __must_check compel_util_send_fd(struct parasite_ctl *ctl, int fd); extern int __must_check compel_util_send_fd(struct parasite_ctl *ctl, int fd);
extern int compel_util_recv_fd(struct parasite_ctl *ctl, int *pfd); extern int compel_util_recv_fd(struct parasite_ctl *ctl, int *pfd);

2
compel/src/lib/infect-util.c
View File

@@ -7,6 +7,8 @@
#include "infect-rpc.h" #include "infect-rpc.h"
#include "infect-util.h" #include "infect-util.h"
uint64_t compel_run_id;
int compel_util_send_fd(struct parasite_ctl *ctl, int fd) int compel_util_send_fd(struct parasite_ctl *ctl, int fd)
{ {
int sk; int sk;

3
compel/src/lib/infect.c
View File

@@ -1,3 +1,4 @@
#include <inttypes.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
@@ -364,7 +365,7 @@ static int gen_parasite_saddr(struct sockaddr_un *saddr, int key)
int sun_len; int sun_len;
saddr->sun_family = AF_UNIX; saddr->sun_family = AF_UNIX;
snprintf(saddr->sun_path, UNIX_PATH_MAX, "X/crtools-pr-%d", key); snprintf(saddr->sun_path, UNIX_PATH_MAX, "X/crtools-pr-%d-%" PRIx64, key, compel_run_id);
sun_len = SUN_LEN(saddr); sun_len = SUN_LEN(saddr);
*saddr->sun_path = '\0'; *saddr->sun_path = '\0';

4
criu/fdstore.c
View File

@@ -12,6 +12,7 @@
#include "xmalloc.h" #include "xmalloc.h"
#include "rst-malloc.h" #include "rst-malloc.h"
#include "log.h" #include "log.h"
#include "util.h"
/* clang-format off */ /* clang-format off */
static struct fdstore_desc { static struct fdstore_desc {
@@ -56,7 +57,8 @@ int fdstore_init(void)
} }
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-fdstore-%" PRIx64, st.st_ino); addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-fdstore-%" PRIx64 "-%" PRIx64, st.st_ino,
criu_run_id);
addrlen += sizeof(addr.sun_family); addrlen += sizeof(addr.sun_family);
addr.sun_path[0] = 0; addr.sun_path[0] = 0;

3
criu/pidfd-store.c
View File

@@ -100,7 +100,8 @@ int init_pidfd_store_sk(pid_t pid, int sk)
goto err; goto err;
} }
addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d", pid, sk); addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d-%" PRIx64, pid, sk,
criu_run_id);
addrlen += sizeof(addr.sun_family); addrlen += sizeof(addr.sun_family);
addr.sun_path[0] = 0; addr.sun_path[0] = 0;

3
criu/unittest/mock.c
View File

@@ -2,6 +2,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
int add_external(char *key) int add_external(char *key)
@@ -141,3 +142,5 @@ int check_mount_v2(void)
{ {
return 0; return 0;
} }
uint64_t compel_run_id;

3
criu/util.c
View File

@@ -52,6 +52,8 @@
#include "cr-errno.h" #include "cr-errno.h"
#include "action-scripts.h" #include "action-scripts.h"
#include "compel/infect-util.h"
#define VMA_OPT_LEN 128 #define VMA_OPT_LEN 128
static int xatol_base(const char *string, long *number, int base) static int xatol_base(const char *string, long *number, int base)
@@ -1816,6 +1818,7 @@ void util_init()
clock_gettime(CLOCK_MONOTONIC, &tp); clock_gettime(CLOCK_MONOTONIC, &tp);
criu_run_id = ((uint64_t)getpid() << 32) + tp.tv_sec + tp.tv_nsec; criu_run_id = ((uint64_t)getpid() << 32) + tp.tv_sec + tp.tv_nsec;
compel_run_id = criu_run_id;
} }
/* /*