mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 06:15:24 +00:00
Code Issues Releases Wiki Activity

kdat: Relax loginuid checks

Browse Source 
Introduce 3-state mode and check them always.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Pavel Emelyanov
2017-05-04 16:31:44 +03:00
committed by Andrei Vagin
parent 08ca20e29e
commit ff65b3b9ed
5 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
criu/cr-check.c
View File

@@ -1044,10 +1044,10 @@ static int check_userns(void)
static int check_loginuid(void)
{
if (kerndat_loginuid(false) < 0)
if (kerndat_loginuid() < 0)
return -1;
if (!kdat.has_loginuid) {
if (kdat.luid != LUID_FULL) {
pr_warn("Loginuid restore is OFF.\n");
return -1;
}

2
criu/cr-dump.c
View File

@@ -341,7 +341,7 @@ static int dump_pid_misc(pid_t pid, TaskCoreEntry *tc)
{
int ret;
if (kdat.has_loginuid) {
if (kdat.luid != LUID_NONE) {
pr_info("dumping /proc/%d/loginuid\n", pid);
tc->has_loginuid = true;

6
criu/cr-restore.c
View File

@@ -762,7 +762,7 @@ static int prepare_proc_misc(pid_t pid, TaskCoreEntry *tc)
int ret;
/* loginuid value is critical to restore */
if (kdat.has_loginuid && tc->has_loginuid &&
if (kdat.luid == LUID_FULL && tc->has_loginuid &&
tc->loginuid != INVALID_UID) {
ret = prepare_loginuid(tc->loginuid, LOG_ERROR);
if (ret < 0)
@@ -1815,7 +1815,7 @@ static int prepare_userns_hook(void)
{
int ret;
if (!kdat.has_loginuid)
if (kdat.luid != LUID_FULL)
return 0;
/*
* Save old loginuid and set it to INVALID_UID:
@@ -1837,7 +1837,7 @@ static int prepare_userns_hook(void)
static void restore_origin_ns_hook(void)
{
if (!kdat.has_loginuid)
if (kdat.luid != LUID_FULL)
return;
/* not critical: it does not affect CT in any way */

10
criu/include/kerndat.h
View File

@@ -14,7 +14,7 @@ extern int kerndat_init(void);
extern int kerndat_init_rst(void);
extern int kerndat_get_dirty_track(void);
extern int kerndat_fdinfo_has_lock(void);
extern int kerndat_loginuid(bool only_dump);
extern int kerndat_loginuid(void);
enum pagemap_func {
PM_UNKNOWN,
@@ -23,6 +23,12 @@ enum pagemap_func {
PM_FULL,
};
enum loginuid_func {
LUID_NONE,
LUID_READ,
LUID_FULL,
};
struct kerndat_s {
dev_t shmem_dev;
int last_cap;
@@ -32,7 +38,7 @@ struct kerndat_s {
bool has_fdinfo_lock;
unsigned long task_size;
bool ipv6;
bool has_loginuid;
enum loginuid_func luid;
bool compat_cr;
enum pagemap_func pmap;
unsigned int has_xtlocks;

15
criu/kerndat.c
View File

@@ -441,22 +441,19 @@ static int get_ipv6()
return 0;
}
int kerndat_loginuid(bool only_dump)
int kerndat_loginuid(void)
{
unsigned int saved_loginuid;
int ret;
kdat.has_loginuid = false;
kdat.luid = LUID_NONE;
/* No such file: CONFIG_AUDITSYSCALL disabled */
saved_loginuid = parse_pid_loginuid(PROC_SELF, &ret, true);
if (ret < 0)
return 0;
if (only_dump) {
kdat.has_loginuid = true;
return 0;
}
kdat.luid = LUID_READ;
/*
* From kernel v3.13-rc2 it's possible to unset loginuid value,
@@ -469,7 +466,7 @@ int kerndat_loginuid(bool only_dump)
if (prepare_loginuid(saved_loginuid, LOG_WARN) < 0)
return 0;
kdat.has_loginuid = true;
kdat.luid = LUID_FULL;
return 0;
}
@@ -585,7 +582,7 @@ int kerndat_init(void)
if (!ret)
ret = get_ipv6();
if (!ret)
ret = kerndat_loginuid(true);
ret = kerndat_loginuid();
if (!ret)
ret = kerndat_iptables_has_xtlocks();
if (!ret)
@@ -619,7 +616,7 @@ int kerndat_init_rst(void)
if (!ret)
ret = get_ipv6();
if (!ret)
ret = kerndat_loginuid(false);
ret = kerndat_loginuid();
if (!ret)
ret = kerndat_iptables_has_xtlocks();
if (!ret)