Skip to content

sk-queue: port SCM_CREDENTIALS checkpoint/restore support from OpenVZ #3026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
3idey wants to merge 18 commits into
base: criu-dev
Choose a base branch
from
Draft

sk-queue: port SCM_CREDENTIALS checkpoint/restore support from OpenVZ #3026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f2bb89c
netlink: dump and restore ucred-s for netlink messages
avagin Mar 7, 2018
15334fa
sk-queue: Add support of ucreds in unix sockets
Mar 7, 2018
faf6e17
zdtm: add sk-unix-cred test for SCM_CREDENTIALS checkpoint/restore
3idey May 26, 2026
edba4cd
zdtm: add scm07 SCM_RIGHTS & SCM_CREDENTIALS case
mihalicyn Nov 2, 2020
d4dc8b4
zdtm: add scm08 test having several SCM_RIGHTS and SCM_CREDENTIALS
Snorch Jun 6, 2022
b6bcab7
zdtm: add scm10 test for scm sent unix sk with closed sender
Snorch Dec 14, 2022
4952ad5
criu: add more information about control messages
avagin Mar 7, 2018
27ac17d
socket: don't restore ucred from kernel messages
avagin Feb 19, 2017
50c53b6
netlink: skip pktinfo scm if a sender group is less than 32
avagin Feb 19, 2017
f1cdb8a
ucred: Drop packets from dead processes
May 11, 2017
323d64c
sk-queue: Show the creds we're sending
Mar 12, 2018
4664a9d
sk-queue: Don't fail if we're dumping dead process queued creds
Apr 10, 2017
a31f1d0
sk-queue: fix lost ScmEntries during SkPacketEntry copy
mihalicyn Oct 30, 2020
8df5faa
sk-queue: fix SCM restore in case when SCM_RIGHTS & SCM_CREDS in one …
mihalicyn Nov 2, 2020
9f98153
sk-queue: fix dumping queue packets
Snorch Jun 6, 2022
ca03262
sk-queue: print message when dumping nested fds from socket
Snorch Dec 13, 2022
67c8a5e
sk-queue: order unixsk sent to other unixsk after it
Snorch Apr 19, 2023
d3af346
sk-unix: resolve fake queuers vs scm fds in unix sockets fallacy
3idey May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions criu/cr-dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include "tty.h"
#include "net.h"
#include "sk-packet.h"
#include "sk-queue.h"
#include "cpu.h"
#include "elf.h"
#include "cgroup.h"
Expand Down Expand Up @@ -2314,6 +2315,9 @@ int cr_dump_tasks(pid_t pid)
if (tty_post_actions())
goto err;

if (sk_queue_post_actions())
goto err;

if (inventory_save_uptime(&he))
goto err;

Expand Down
4 changes: 4 additions & 0 deletions criu/cr-restore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,10 @@ static int root_prepare_shared(void)
if (ret)
goto err;

ret = add_fake_unix_queuers_finish();
if (ret)
goto err;

ret = run_post_prepare();
if (ret)
goto err;
Expand Down
7 changes: 6 additions & 1 deletion criu/include/sk-queue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
#define __CR_SK_QUEUE_H__

extern struct collect_image_info sk_queues_cinfo;
extern int dump_sk_queue(int sock_fd, int sock_id);

#define SK_QUEUE_REAL_PID 0x1 /* scm creds contains a real pid */
#define SK_QUEUE_DUMP_ADDR 0x2 /* save a sender address for messages */
#define SK_QUEUE_TRACK_ENOBUFS 0x4 /* don't fail at ENOBUFS, fill *val if it is present */
extern int dump_sk_queue(int sock_fd, int sock_id, int flags, int *val);
extern int sk_queue_post_actions(void);
extern int restore_sk_queue(int fd, unsigned int peer_id);

#endif /* __CR_SK_QUEUE_H__ */
1 change: 1 addition & 0 deletions criu/include/sockets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ extern int collect_sockets(struct ns_id *);
extern struct collect_image_info inet_sk_cinfo;
extern struct collect_image_info unix_sk_cinfo;
extern int add_fake_unix_queuers(void);
extern int add_fake_unix_queuers_finish(void);
extern int fix_external_unix_sockets(void);
extern int prepare_scms(void);
extern int unix_note_scm_rights(int id_for, uint32_t *file_ids, int *fds, int n_ids);
Expand Down
Loading
Loading