Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

sk-unix: rework bind_on_deleted() return codes

Browse source 
bind_on_delete() return code is only used for setting errno for pr_perror()
This is mostly useless since a lot of syscalls already set it. All of
non-syscall errors already have prints in case of failure.
Fix bind_on_deleted() always returning 0 and simplify error juggling to
returning -1 in case of errors.

Fixes: #1771
Fixes: d0308e5ecc ("sk-unix: make criu respect existing files while restoring ghost unix socket fd")
Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
This commit is contained in:
Andrey Zhadchenko 2022-03-28 16:37:12 +03:00 • committed by Andrei Vagin
parent 5b872c7183
commit d14dbb8c74
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
criu/sk-unix.c
View file

@ -1472,7 +1472,7 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
char path[PATH_MAX], path_parked[PATH_MAX], *pos;
struct sockaddr_un addr;
bool renamed = false;
int ret;
int ret, exit_code = -1;
if (ui->ue->name.len >= UNIX_PATH_MAX) {
pr_err("ghost: Too long name for socket id %#x ino %u name %s\n", ui->ue->id, ui->ue->ino, ui->name);
@ -1494,10 +1494,9 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
}
if (errno != ENOENT) {
ret = -errno;
pr_perror("ghost: Can't access %s for socket id %#x ino %u name %s", path, ui->ue->id,
ui->ue->ino, ui->name);
return ret;
return -1;
}
}
@ -1508,9 +1507,8 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
pr_debug("ghost: socket id %#x ino %u name %s creating %s\n", ui->ue->id, ui->ue->ino, ui->name, pos);
ret = mkdirpat(AT_FDCWD, pos, 0755);
if (ret) {
errno = -ret;
pr_perror("ghost: Can't create %s", pos);
return ret;
return -1;
}
memset(&addr, 0, sizeof(addr));
@ -1529,10 +1527,9 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
pr_debug("ghost: Unlinked stale socket id %#x ino %d name %s\n", ui->ue->id, ui->ue->ino,
path_parked);
if (rename(ui->name, path_parked)) {
ret = -errno;
pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s", ui->ue->id, ui->ue->ino, ui->name,
path_parked);
return ret;
return -1;
}
pr_debug("ghost: id %#x ino %d renamed %s -> %s\n", ui->ue->id, ui->ue->ino, ui->name, path_parked);
renamed = true;
@ -1540,7 +1537,6 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
ret = bind(sk, (struct sockaddr *)&addr, sizeof(addr.sun_family) + ui->ue->name.len);
if (ret < 0) {
ret = -errno;
pr_perror("ghost: Can't bind on socket id %#x ino %d addr %s", ui->ue->id, ui->ue->ino, ui->name);
goto out_rename;
}
@ -1552,9 +1548,10 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
ret = keep_deleted(ui);
if (ret < 0) {
pr_err("ghost: Can't save socket %#x ino %u addr %s into fdstore\n", ui->ue->id, ui->ue->ino, ui->name);
ret = -EIO;
goto out;
}
exit_code = 0;
out:
/*
* Once everything is ready, just remove the socket from the
@ -1562,14 +1559,14 @@ out:
*/
ret = unlinkat(AT_FDCWD, ui->name, 0);
if (ret < 0) {
ret = -errno;
exit_code = -1;
pr_perror("ghost: Can't unlink socket %#x ino %u addr %s", ui->ue->id, ui->ue->ino, ui->name);
}
out_rename:
if (renamed) {
if (rename(path_parked, ui->name)) {
ret = -errno;
exit_code = -1;
pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s", ui->ue->id, ui->ue->ino,
path_parked, ui->name);
} else {
@ -1598,7 +1595,7 @@ out_rename:
}
}
return 0;
return exit_code;
}
static int bind_unix_sk(int sk, struct unix_sk_info *ui)
@ -1643,8 +1640,6 @@ static int bind_unix_sk(int sk, struct unix_sk_info *ui)
if (ui->flags & USK_GHOST_FDSTORE) {
pr_debug("ghost: bind id %#x ino %u addr %s\n", ui->ue->id, ui->ue->ino, ui->name);
ret = bind_on_deleted(sk, ui);
if (ret)
errno = -ret;
} else {
pr_debug("bind id %#x ino %u addr %s\n", ui->ue->id, ui->ue->ino, ui->name);
ret = bind(sk, (struct sockaddr *)&addr, sizeof(addr.sun_family) + ui->ue->name.len);