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

kerndat: do not report errors on feature test

Browse Source 
prepare_loginuid() called on kerndat_loginuid where it tests for
loginuid restore feature. Let's omit error printing for feature test.

Signed-off-by: Dmitry Safonov <dsafonov@odin.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Dmitry Safonov
2015-12-28 18:31:25 +03:00
committed by Pavel Emelyanov
parent 4864996ed8
commit 0ce8e42995
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cr-restore.c
View File

@@ -866,7 +866,7 @@ static int prepare_proc_misc(pid_t pid, TaskCoreEntry *tc)
/* loginuid value is critical to restore */
if (kdat.has_loginuid && tc->has_loginuid &&
tc->loginuid != INVALID_UID) {
ret = prepare_loginuid(tc->loginuid);
ret = prepare_loginuid(tc->loginuid, LOG_ERROR);
if (ret < 0)
return ret;
}
@@ -1867,7 +1867,7 @@ static int prepare_userns_hook(void)
if (ret < 0)
return -1;
if (prepare_loginuid(INVALID_UID) < 0) {
if (prepare_loginuid(INVALID_UID, LOG_ERROR) < 0) {
pr_err("Setting loginuid for CT init task failed, CAP_AUDIT_CONTROL?");
return -1;
}
@@ -1880,7 +1880,7 @@ static void restore_origin_ns_hook(void)
return;
/* not critical: it does not affect CT in any way */
if (prepare_loginuid(saved_loginuid) < 0)
if (prepare_loginuid(saved_loginuid, LOG_ERROR) < 0)
pr_err("Restore original /proc/self/loginuid failed");
}

2
include/proc_parse.h
View File

@@ -127,7 +127,7 @@ extern struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool fo
extern int parse_pid_stat(pid_t pid, struct proc_pid_stat *s);
extern unsigned int parse_pid_loginuid(pid_t pid, int *err);
extern int parse_pid_oom_score_adj(pid_t pid, int *err);
extern int prepare_loginuid(unsigned int value);
extern int prepare_loginuid(unsigned int value, unsigned int loglevel);
extern int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list);
extern int parse_self_maps_lite(struct vm_area_list *vms);
extern int parse_pid_status(pid_t pid, struct proc_status_creds *);

4
kerndat.c
View File

@@ -442,10 +442,10 @@ int kerndat_loginuid(bool only_dump)
* on that rely dump/restore code.
* See also: marc.info/?l=git-commits-head&m=138509506407067
*/
if (prepare_loginuid(INVALID_UID) < 0)
if (prepare_loginuid(INVALID_UID, LOG_WARN) < 0)
return 0;
/* Cleaning value back as it was */
if (prepare_loginuid(saved_loginuid) < 0)
if (prepare_loginuid(saved_loginuid, LOG_WARN) < 0)
return 0;
kdat.has_loginuid = true;

6
proc_parse.c
View File

@@ -809,7 +809,7 @@ err:
return -1;
}
int prepare_loginuid(unsigned int value)
int prepare_loginuid(unsigned int value, unsigned int loglevel)
{
int fd, ret = 0;
char buf[11]; /* 4294967295 is maximum for u32 */
@@ -821,7 +821,9 @@ int prepare_loginuid(unsigned int value)
snprintf(buf, 11, "%u", value);
if (write(fd, buf, 11) < 0) {
pr_perror("Write %s to /proc/self/loginuid failed", buf);
print_on_level(loglevel,
"Write %s to /proc/self/loginuid failed: %s",
buf, strerror(errno));
ret = -1;
}
close(fd);