mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 22:05:36 +00:00
Code Issues Releases Wiki Activity

tty: Verify info once

Browse Source 
Same here -- now when we collect info and driver at the same
place late enough we can verify info once, then attach to
files.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Pavel Emelyanov
2017-07-19 14:20:17 +03:00
parent c93edee2cb
commit ce3e40eef4
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
criu/tty.c
View File

@@ -726,12 +726,12 @@ err:
return ret ? -1 : 0; return ret ? -1 : 0;
} }
static bool tty_is_master(struct tty_info *info) static bool __tty_is_master(struct tty_driver *driver)
{ {
if (info->driver->subtype == TTY_SUBTYPE_MASTER) if (driver->subtype == TTY_SUBTYPE_MASTER)
return true; return true;
switch (info->driver->type) { switch (driver->type) {
case TTY_TYPE__CONSOLE: case TTY_TYPE__CONSOLE:
case TTY_TYPE__CTTY: case TTY_TYPE__CTTY:
return true; return true;
@@ -747,6 +747,11 @@ static bool tty_is_master(struct tty_info *info)
return false; return false;
} }
static bool tty_is_master(struct tty_info *info)
{
return __tty_is_master(info->driver);
}
static bool tty_is_hung(struct tty_info *info) static bool tty_is_hung(struct tty_info *info)
{ {
return info->tie->termios == NULL; return info->tie->termios == NULL;
@@ -1455,10 +1460,10 @@ static int verify_termios(u32 id, TermiosEntry *e)
return 0; return 0;
} }
#define term_opts_missing_cmp(p, op) \ #define term_opts_missing_cmp(tie, op) \
(!(p)->tie->termios op \ (!(tie)->termios op \
!(p)->tie->termios_locked op \ !(tie)->termios_locked op \
!(p)->tie->winsize) !(tie)->winsize)
#define term_opts_missing_any(p) \ #define term_opts_missing_any(p) \
term_opts_missing_cmp(p, ||) term_opts_missing_cmp(p, ||)
@@ -1466,33 +1471,28 @@ static int verify_termios(u32 id, TermiosEntry *e)
#define term_opts_missing_all(p) \ #define term_opts_missing_all(p) \
term_opts_missing_cmp(p, &&) term_opts_missing_cmp(p, &&)
static int verify_info(struct tty_info *info) static int verify_info(TtyInfoEntry *tie, struct tty_driver *driver)
{ {
if (!info->driver) {
pr_err("Unknown driver master peer %#x\n", info->tfe->id);
return -1;
}
/* /*
* Master peer must have all parameters present, * Master peer must have all parameters present,
* while slave peer must have either all parameters present * while slave peer must have either all parameters present
* or don't have them at all. * or don't have them at all.
*/ */
if (term_opts_missing_any(info)) { if (term_opts_missing_any(tie)) {
if (tty_is_master(info)) { if (__tty_is_master(driver)) {
pr_err("Corrupted master peer %#x\n", info->tfe->id); pr_err("Corrupted master peer %#x\n", tie->id);
return -1; return -1;
} else if (!term_opts_missing_all(info)) { } else if (!term_opts_missing_all(tie)) {
pr_err("Corrupted slave peer %#x\n", info->tfe->id); pr_err("Corrupted slave peer %#x\n", tie->id);
return -1; return -1;
} }
} }
if (verify_termios(info->tfe->id, info->tie->termios_locked) || if (verify_termios(tie->id, tie->termios_locked) ||
verify_termios(info->tfe->id, info->tie->termios)) verify_termios(tie->id, tie->termios))
return -1; return -1;
if (info->tie->termios && info->tfe->tty_info_id > (MAX_TTYS << 1)) if (tie->termios && tie->id > (MAX_TTYS << 1))
return -1; return -1;
return 0; return 0;
@@ -1537,6 +1537,9 @@ static int collect_one_tty_info_entry(void *obj, ProtobufCMessage *msg, struct c
return -1; return -1;
} }
if (verify_info(tie, driver))
return -1;
list_for_each_entry_safe(info, n, &collected_ttys, list) { list_for_each_entry_safe(info, n, &collected_ttys, list) {
if (info->tfe->tty_info_id != tie->id) if (info->tfe->tty_info_id != tie->id)
continue; continue;
@@ -1593,9 +1596,6 @@ static int tty_info_setup(struct tty_info *info)
info->tty_data = NULL; info->tty_data = NULL;
info->link = NULL; info->link = NULL;
if (verify_info(info))
return -1;
/* /*
* The image might have no reg file record in old CRIU, so * The image might have no reg file record in old CRIU, so
* lets don't fail for a while. After a couple of releases * lets don't fail for a while. After a couple of releases