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

tty: Sanitize ctl terminal restore codeflow

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2015-02-18 18:29:31 +03:00
parent d47975b5ec
commit bc535380de
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tty.c
View File

@@ -584,6 +584,7 @@ static int tty_restore_ctl_terminal(struct file_desc *d, int fd)
struct tty_info *info = container_of(d, struct tty_info, d);
struct tty_type *type = info->type;
struct reg_file_info *fake = NULL;
struct file_desc *slave_d;
int slave = -1, ret = -1, index = -1;
if (!is_service_fd(fd, CTL_TTY_OFF))
@@ -598,25 +599,16 @@ static int tty_restore_ctl_terminal(struct file_desc *d, int fd)
fake = pty_alloc_fake_slave(info);
if (!fake)
goto err;
slave = open_pty_reg(&fake->d, O_RDONLY);
if (slave < 0) {
pr_perror("Can't open %s", path_from_reg(&fake->d));
goto err;
}
} else if (info->type->t == TTY_TYPE_CONSOLE) {
slave = open_pty_reg(info->reg_d, O_RDONLY);
if (slave < 0) {
pr_perror("Can't open %s", path_from_reg(info->reg_d));
goto err;
}
} else if (info->type->t == TTY_TYPE_VT) {
slave = open_pty_reg(info->reg_d, O_RDONLY);
if (slave < 0) {
pr_perror("Can't open %s", path_from_reg(info->reg_d));
goto err;
}
slave_d = &fake->d;
} else
BUG();
slave_d = info->reg_d;
slave = open_pty_reg(slave_d, O_RDONLY);
if (slave < 0) {
pr_perror("Can't open %s", path_from_reg(slave_d));
goto err;
}
pr_info("Restore session %d by %d tty (index %d)\n",
info->tie->sid, (int)getpid(), index);